Index: branches/5.3.x/core/kernel/session/session.php
===================================================================
--- branches/5.3.x/core/kernel/session/session.php	(revision 16518)
+++ branches/5.3.x/core/kernel/session/session.php	(revision 16519)
@@ -1,1132 +1,1132 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 /*
 The session works the following way:
 
 1. When a visitor loads a page from the site the script checks if cookies_on varibale has been passed to it as a cookie.
 2. If it has been passed, the script tries to get Session ID (SID) from the request:
 3. Depending on session mode the script is getting SID differently.
 
 The following modes are available:
 - Session::smAUTO
 Automatic mode: if cookies are on at the client side, the script relays only on cookies and
 ignore all other methods of passing SID. If cookies are off at the client side, the script relays on SID
 passed through query string and referal passed by the client. THIS METHOD IS NOT 100% SECURE, as long as
 attacker may get SID and substitude referal to gain access to user' session. One of the faults of this method
 is that the session is only created when the visitor clicks the first link on the site, so there
 is NO session at the first load of the page. (Actually there is a session, but it gets lost after
 the first click because we do not use SID in query string while we are not sure if we need it)
 
 - Session::smCOOKIES_ONLY
 Cookies only: in this mode the script relays solely on cookies passed from the browser and ignores
 all other methods. In this mode there is no way to use sessions for clients without cookies support
 or cookies support disabled. The cookies are stored with the full domain name and path to base-directory
 of script installation.
 
 - Session::smGET_ONLY
 GET only: the script will not set any cookies and will use only SID passed in query string using GET,
 it will also check referal. The script will set SID at the first load of the page
 
 - Session::smCOOKIES_AND_GET
 Combined mode: the script will use both cookies and GET right from the start. If client has cookies enabled,
 the script will check SID stored in cookie and passed in query string, and will use this SID only if both
 cookie and query string matches. However if cookies are disabled on the client side, the script will work
 the same way as in GET_ONLY mode.
 
 4. After the script has the SID it tries to load it from the Storage (default is database)
 
 5. If such SID is found in the database, the script checks its expiration time. If session is not expired,
 it updates its expiration, and resend the cookie (if applicable to session mode)
 
 6. Then the script loads all the data (session variables) pertaining to the SID.
 
 
 Usage:
 
 $session = new Session(Session::smAUTO); //Session::smAUTO is default, you could just leave the brackets empty, or provide another mode
 
 $session->SetCookieDomain('my.domain.com');
 $session->SetCookiePath('/myscript');
 $session->SetCookieName('my_sid_cookie');
 $session->SetGETName('sid');
 $session->InitSession();
 ...
 
 //link output:
 
 echo "<a href='index.php?'". ( $session->NeedQueryString() ? 'sid='.$session->SID : '' ) .">My Link</a>";
 
 */
 
 class BaseSession extends kBase
 {
 
 	const smAUTO = 1;
 	const smCOOKIES_ONLY = 2;
 	const smGET_ONLY = 3;
 	const smCOOKIES_AND_GET = 4;
 
 	var $Checkers;
 
 	var $Mode;
 	var $OriginalMode = null;
 	var $GETName = 'sid';
 
 	var $CookiesEnabled = true;
 	var $CookieName = 'sid';
 	var $CookieDomain;
 	var $CookiePath;
 	var $CookieSecure = 0;
 
 	var $SessionTimeout = 3600;
 	var $Expiration;
 
 	var $SID;
 
 	var $CachedSID;
 
 	var $SessionSet = false;
 
 	/**
 	 * Session ID is used from GET
 	 *
 	 * @var bool
 	 */
 	var $_fromGet = false;
 
 	/**
 	 * Enter description here...
 	 *
 	 * @var BaseSessionStorage
 	 * @access protected
 	 */
 	protected $Storage;
 
 	var $CachedNeedQueryString = null;
 
 	/**
 	 * Session Data array
 	 *
 	 * @var Params
 	 */
 	var $Data;
 
 	/**
 	 * Names of optional session keys with their optional values (which does not need to be always stored)
 	 *
 	 * @var Array
 	 */
 	var $OptionalData = Array ();
 
 	/**
 	 * Session expiration mark
 	 *
 	 * @var bool
 	 */
 	var $expired = false;
 
 	/**
 	 * Creates session
 	 *
 	 * @param int $mode
 	 * @access public
 	 */
 	public function __construct($mode = self::smAUTO)
 	{
 		parent::__construct();
 
 		$this->SetMode($mode);
 	}
 
 	function SetMode($mode)
 	{
 		$this->Mode = $mode;
 		$this->CachedNeedQueryString = null;
 		$this->CachedSID = null;
 	}
 
 	function SetCookiePath($path)
 	{
 		$this->CookiePath = str_replace(' ', '%20', $path);
 	}
 
 	/**
 	 * Setting cookie domain. Set false for local domains, because they don't contain dots in their names.
 	 *
 	 * @param string $domain
 	 */
 	function SetCookieDomain($domain)
 	{
 		// 1. localhost or other like it without "." in domain name
 		if (!substr_count($domain, '.')) {
 			// don't use cookie domain at all
 			$this->CookieDomain = false;
 			return ;
 		}
 
 		// 2. match using predefined cookie domains from configuration
 		$cookie_domains = $this->Application->ConfigValue('SessionCookieDomains');
 
 		if ($cookie_domains) {
 			$cookie_domains = array_map('trim', explode("\n", $cookie_domains));
 
 			foreach ($cookie_domains as $cookie_domain) {
 				if (ltrim($cookie_domain, '.') == $domain) {
 					$this->CookieDomain = $cookie_domain; // as defined in configuration
 					return ;
 				}
 			}
 		}
 
 		// 3. only will execute, when none of domains were matched at previous step
 		$this->CookieDomain = $this->_autoGuessDomain($domain);
 	}
 
 	/**
 	 * Auto-guess cookie domain based on $_SERVER['HTTP_HOST']
 	 *
 	 * @param $domain
 	 * @return string
 	 */
 	function _autoGuessDomain($domain)
 	{
 		static $cache = Array ();
 
 		if (!array_key_exists($domain, $cache)) {
 			switch ( substr_count($domain, '.') ) {
 				case 2:
 					// 3rd level domain (3 parts)
 					$cache[$domain] = substr($domain, strpos($domain, '.')); // with leading "."
 					break;
 
 				case 1:
 					// 2rd level domain (2 parts)
 					$cache[$domain] = '.' . $domain; // with leading "."
 					break;
 
 				default:
 					// more then 3rd level
 					$cache[$domain] = ltrim($domain, '.'); // without leading "."
 					break;
 			}
 		}
 
 		return $cache[$domain];
 	}
 
 	function SetGETName($get_name)
 	{
 		$this->GETName = $get_name;
 	}
 
 	function SetCookieName($cookie_name)
 	{
 		$this->CookieName = $cookie_name;
 	}
 
 	function InitStorage($special)
 	{
 		$this->Storage = $this->Application->recallObject('SessionStorage.'.$special);
 		$this->Storage->setSession($this);
 	}
 
 	public function Init($prefix, $special)
 	{
 		parent::Init($prefix, $special);
 
 		if ( php_sapi_name() == 'cli' ) {
 			$this->SetMode(self::smGET_ONLY);
 		}
 
 		$this->CheckIfCookiesAreOn();
 
 		$this->Checkers = Array();
 		$this->InitStorage($special);
 		$this->Data = new Params();
 
 		$tmp_sid = $this->GetPassedSIDValue();
 
 		$check = $this->Check();
 
 		if ($this->Application->isAdmin) {
 			// 1. Front-End session may not be created (SID is present, but no data in database).
 			// Check expiration LATER from kApplication::Init, because template, used in session
 			// expiration redirect should be retrieved from mod-rewrite url first.
 
 			// 2. Admin sessions are always created, so case when SID is present,
 			// but session in database isn't is 100% session expired. Check expiration
 			// HERE because Session::SetSession will create missing session in database
 			// and when Session::ValidateExpired will be called later from kApplication::Init
 			// it won't consider such session as expired !!!
 			$this->ValidateExpired();
 		}
 
 		if ($check) {
 			$this->SID = $this->GetPassedSIDValue();
 			$this->Refresh();
 			$this->LoadData();
 		}
 		else {
 			$this->SetSession();
 		}
 
 		if (!is_null($this->OriginalMode)) $this->SetMode($this->OriginalMode);
 	}
 
 	function ValidateExpired()
 	{
 		if (defined('IS_INSTALL') && IS_INSTALL) {
 			return ;
 		}
 
 //		$this->DeleteExpired(); // called from u:OnDeleteExpiredSessions scheduled task now
 
 		if ($this->expired || ($this->CachedSID && !$this->_fromGet && !$this->SessionSet)) {
 			$this->RemoveSessionCookie();
 			// true was here to force new session creation, but I (kostja) used
 			// RemoveCookie a line above, to avoid redirect loop with expired sid
 			// not being removed setSession with true was used before, to set NEW
 			// session cookie
 			$this->SetSession();
 
 			// case #1: I've OR other site visitor expired my session
 			// case #2: I have no session in database, but SID is present
 			$this->expired = false;
 			$this->Application->HandleEvent(new kEvent('u:OnSessionExpire'));
 		}
 	}
 
 	/**
 	 * Helper method for detecting cookie availability
 	 *
 	 * @return bool
 	 */
 	function _checkCookieReferer()
 	{
 		// removing /admin for compatability with in-portal (in-link/admin/add_link.php)
 		$path = preg_replace('/admin[\/]{0,1}$/', '', $this->CookiePath);
 		$reg = '#^'.preg_quote(PROTOCOL.ltrim($this->CookieDomain, '.').$path).'#';
 
 		return preg_match($reg, getArrayValue($_SERVER, 'HTTP_REFERER') );
 	}
 
 	function CheckIfCookiesAreOn()
 	{
 		if ( $this->Mode == self::smGET_ONLY ) {
 			//we don't need to bother checking if we would not use it
 			$this->CookiesEnabled = false;
 			return false;
 		}
 
+		/** @var kHTTPQuery $http_query */
 		$http_query = $this->Application->recallObject('kHTTPQuery');
-		/* @var $http_query kHTTPQuery */
 
 		$cookies_on = array_key_exists('cookies_on', $http_query->Cookie); // not good here
 
 		$get_sid = getArrayValue($http_query->Get, $this->GETName);
 
 		if ( ($this->Application->HttpQuery->IsHTTPSRedirect() && $get_sid) || $this->getFlashSID() ) { // Redirect from http to https on different domain OR flash uploader
 			$this->OriginalMode = $this->Mode;
 			$this->SetMode(self::smGET_ONLY);
 		}
 
 		if ( !$cookies_on || $this->Application->HttpQuery->IsHTTPSRedirect() || $this->getFlashSID() ) {
 			//If referer is our server, but we don't have our cookies_on, it's definetly off
 			$is_install = defined('IS_INSTALL') && IS_INSTALL;
 			if ( !$is_install && $this->_checkCookieReferer() && !$this->Application->GetVar('admin') && !$this->Application->HttpQuery->IsHTTPSRedirect() ) {
 				$this->CookiesEnabled = false;
 			}
 			else {
 				//Otherwise we still suppose cookies are on, because may be it's the first time user visits the site
 				//So we send cookies on to get it next time (when referal will tell us if they are realy off
 				$this->SetCookie('cookies_on', 1, time() + 31104000); //one year should be enough
 			}
 		}
 		else {
 			$this->CookiesEnabled = true;
 		}
 
 		return $this->CookiesEnabled;
 	}
 
 	/**
 	 * Sets cookie for current site using path and domain
 	 *
 	 * @param string $name
 	 * @param mixed $value
 	 * @param int $expires
 	 */
 	function SetCookie($name, $value, $expires = null)
 	{
 		if (isset($expires) && $expires < time()) {
 			unset($this->Application->HttpQuery->Cookie[$name]);
 		}
 		else {
 			$this->Application->HttpQuery->Cookie[$name] = $value;
 		}
 
 		$old_style_domains = Array (
 			// domain like in pre 5.1.0 versions
 			'.' . SERVER_NAME,
 
 			// auto-guessed domain (when user specified other domain in configuration variable)
 			$this->_autoGuessDomain(SERVER_NAME)
 		);
 
 		$cookie_hasher = $this->Application->makeClass('kCookieHasher');
 		/* @var $cookie_hasher kCookieHasher */
 
 		$encrypted_value = $cookie_hasher->encrypt($name, $value);
 
 		foreach ($old_style_domains as $old_style_domain) {
 			if ($this->CookieDomain != $old_style_domain) {
 				// new style cookie domain -> delete old style cookie to prevent infinite redirect
 				setcookie($name, $encrypted_value, time() - 3600, $this->CookiePath, $old_style_domain, $this->CookieSecure, true);
 			}
 		}
 
 		setcookie($name, $encrypted_value, $expires, $this->CookiePath, $this->CookieDomain, $this->CookieSecure, true);
 	}
 
 	function Check()
 	{
 		// don't check referer here, because it doesn't provide any security option and can be easily falsified
 
 		$sid = $this->GetPassedSIDValue();
 
 		if (empty($sid)) {
 			return false;
 		}
 
 		//try to load session by sid, if everything is fine
 		$result = $this->LoadSession($sid);
 
 		$this->SessionSet = $result; // fake front-end session will given "false" here
 
 		return $result;
 	}
 
 	function LoadSession($sid)
 	{
 		if( $this->Storage->LocateSession($sid) ) {
 			// if we have session with such SID - get its expiration
 			$this->Expiration = $this->Storage->GetExpiration();
 
 			// If session has expired
 			if ($this->Expiration < time()) {
 				// when expired session is loaded, then SID is
 				// not assigned, but used in Destroy method
 				$this->SID = $sid;
 				$this->Destroy();
 
 				$this->expired = true;
 
 				// when Destory methods calls SetSession inside and new session get created
 				return $this->SessionSet;
 			}
 
 			// Otherwise it's ok
 			return true;
 		}
 		else {
 			// fake or deleted due to expiration SID
 			if (!$this->_fromGet) {
 				$this->expired = true;
 			}
 
 			return false;
 		}
 	}
 
 	function getFlashSID()
 	{
+		/** @var kHTTPQuery $http_query */
 		$http_query = $this->Application->recallObject('kHTTPQuery');
-		/* @var $http_query kHTTPQuery */
 
 		return getArrayValue($http_query->Post, 'flashsid');
 	}
 
 	function GetPassedSIDValue($use_cache = 1)
 	{
 		if (!empty($this->CachedSID) && $use_cache) {
 			return $this->CachedSID;
 		}
 
 		// flash sid overrides regular sid
 		$get_sid = $this->getFlashSID();
 
 		if (!$get_sid) {
+			/** @var kHTTPQuery $http_query */
 			$http_query = $this->Application->recallObject('kHTTPQuery');
-			/* @var $http_query kHTTPQuery */
 
 			$get_sid = getArrayValue($http_query->Get, $this->GETName);
 		}
 
 		$sid_from_get = $get_sid ? true : false;
 
 		if ($this->Application->GetVar('admin') == 1 && $get_sid) {
 			$sid = $get_sid;
 		}
 		else {
 			switch ($this->Mode) {
 				case self::smAUTO:
 					//Cookies has the priority - we ignore everything else
 					$sid = $this->CookiesEnabled ? $this->GetSessionCookie() : $get_sid;
 
 					if ($this->CookiesEnabled) {
 						$sid_from_get = false;
 					}
 					break;
 
 				case self::smCOOKIES_ONLY:
 					$sid = $this->GetSessionCookie();
 					break;
 
 				case self::smGET_ONLY:
 					$sid = $get_sid;
 					break;
 
 				case self::smCOOKIES_AND_GET:
 					$cookie_sid = $this->GetSessionCookie();
 					//both sids should match if cookies are enabled
 					if (!$this->CookiesEnabled || ($cookie_sid == $get_sid)) {
 						$sid = $get_sid; //we use get here just in case cookies are disabled
 					}
 					else {
 						$sid = '';
 						$sid_from_get = false;
 					}
 					break;
 			}
 		}
 
 		$this->CachedSID = $sid;
 		$this->_fromGet = $sid_from_get;
 
 		return $this->CachedSID;
 	}
 
 	/**
 	 * Returns session id
 	 *
 	 * @return int
 	 * @access public
 	 */
 	function GetID()
 	{
 		return $this->SID;
 	}
 
 	/**
 	 * Generates new session id
 	 *
 	 * @return int
 	 * @access private
 	 */
 	function GenerateSID()
 	{
 		$this->setSID(kUtil::generateId());
 
 		return $this->SID;
 	}
 
 	/**
 	 * Set's new session id
 	 *
 	 * @param int $new_sid
 	 * @access private
 	 */
 	function setSID($new_sid)
 	{
 		$this->SID /*= $this->CachedSID*/ = $new_sid; // don't set cached sid here
 		$this->Application->SetVar($this->GETName,$new_sid);
 	}
 
 	function NeedSession()
 	{
 		$data = $this->Data->GetParams();
 
 		$data_keys = array_keys($data);
 		$optional_keys = array_keys($this->OptionalData);
 		$real_keys = array_diff($data_keys, $optional_keys);
 
 		return $real_keys ? true : false;
 	}
 
 	function SetSession($force = false)
 	{
 		if ( $this->SessionSet && !$force ) {
 			return true;
 		}
 
 		$this->Expiration = time() + $this->SessionTimeout;
 
 		if ( !$force && /*!$this->Application->isAdmin &&*/ !$this->Application->GetVar('admin') && !$this->NeedSession() ) {
 			// don't create session (in db) on Front-End, when sid is present (GPC), but data in db isn't
 			if ( $this->_fromGet ) {
 				// set sid, that was given in GET
 				$this->setSID($this->GetPassedSIDValue());
 			}
 			else {
 				// re-generate sid only, when cookies are used
 				$this->GenerateSID();
 			}
 
 			$this->Storage->StoreSession(false);
 
 			return false;
 		}
 
 		if ( !$this->SID || $force ) {
 			$this->GenerateSID();
 		}
 
 		switch ( $this->Mode ) {
 			case self::smAUTO:
 				if ( $this->CookiesEnabled ) {
 					$this->SetSessionCookie();
 				}
 				break;
 
 			case self::smGET_ONLY:
 				break;
 
 			case self::smCOOKIES_ONLY:
 			case self::smCOOKIES_AND_GET:
 				$this->SetSessionCookie();
 				break;
 		}
 
 		$this->Storage->StoreSession();
 
 		if ( $this->Application->isAdmin || $this->Special == 'admin' ) {
 			$this->StoreVar('admin', 1);
 		}
 
 		$this->SessionSet = true; // should be called before SaveData, because SaveData will try to SetSession again
 		if ( $this->Special != '' ) {
 			// front-session called from admin or otherwise, then save it's data
 			$this->SaveData();
 		}
 
 		$this->Application->resetCounters('UserSessions');
 		return true;
 	}
 
 	/**
 	 * Returns SID from cookie.
 	 *
 	 * Use 2 cookies to have 2 expiration:
 	 * - 1. for normal expiration when browser is not closed (30 minutes by default), configurable
 	 * - 2. for advanced expiration when browser is closed
 	 *
 	 * @return int
 	 */
 	function GetSessionCookie()
 	{
 		$keep_session_on_browser_close = $this->Application->ConfigValue('KeepSessionOnBrowserClose');
 		if (isset($this->Application->HttpQuery->Cookie[$this->CookieName]) &&
 					( $keep_session_on_browser_close ||
 						(
 							!$keep_session_on_browser_close &&
 							isset($this->Application->HttpQuery->Cookie[$this->CookieName.'_live'])
 							&&
 							$this->Application->HttpQuery->Cookie[$this->CookieName] == $this->Application->HttpQuery->Cookie[$this->CookieName.'_live']
 						)
 					)
 				) {
 			return $this->Application->HttpQuery->Cookie[$this->CookieName];
 		}
 		return false;
 	}
 
 	/**
 	 * Updates SID in cookie with new value
 	 *
 	 */
 	function SetSessionCookie()
 	{
 		$this->SetCookie($this->CookieName, $this->SID, $this->Expiration);
 		$this->SetCookie($this->CookieName.'_live', $this->SID);
 	}
 
 	function RemoveSessionCookie()
 	{
 		$this->SetCookie($this->CookieName, '');
 		$this->SetCookie($this->CookieName.'_live', '');
 	}
 
 	/**
 	 * Refreshes session expiration time
 	 *
 	 * @access private
 	 */
 	function Refresh()
 	{
 		if ($this->Application->GetVar('skip_session_refresh')) {
 			return ;
 		}
 
 		if ($this->CookiesEnabled) {
 			// we need to refresh the cookie
 			$this->SetSessionCookie();
 		}
 		$this->Storage->UpdateSession();
 	}
 
 	function Destroy()
 	{
 		$this->Storage->DeleteSession();
 		$this->Data = new Params();
 		$this->SID = $this->CachedSID = '';
 		$this->SessionSet = false;
 
 		if ($this->CookiesEnabled) {
 			$this->SetSessionCookie(); //will remove the cookie due to value (sid) is empty
 		}
 
 		$this->SetSession(true); //will create a new session, true to force
 	}
 
 	function NeedQueryString($use_cache = 1)
 	{
 		if ($this->CachedNeedQueryString != null && $use_cache) {
 			return $this->CachedNeedQueryString;
 		}
 
 		$result = false;
 		switch ($this->Mode) {
 			case self::smAUTO:
 				if (!$this->CookiesEnabled) {
 					$result = true;
 				}
 				break;
 
 			/*case self::smCOOKIES_ONLY:
 				break;*/
 
 			case self::smGET_ONLY:
 			case self::smCOOKIES_AND_GET:
 				$result = true;
 				break;
 		}
 
 		$this->CachedNeedQueryString = $result;
 
 		return $result;
 	}
 
 	function LoadData()
 	{
 		$this->Data->AddParams( $this->Storage->LoadData() );
 	}
 
 	/**
 	 * Returns information about session contents
 	 *
 	 * @param bool $include_optional
 	 * @return array
 	 * @access public
 	 */
 	public function getSessionData($include_optional = true)
 	{
 		$session_data = $this->Data->GetParams();
 		ksort($session_data);
 
 		foreach ($session_data as $session_key => $session_value) {
 			if ( kUtil::IsSerialized($session_value) ) {
 				$session_data[$session_key] = unserialize($session_value);
 			}
 		}
 
 		if ( !$include_optional ) {
 			$optional_keys = array_keys($this->OptionalData);
 
 			foreach ($session_data as $session_key => $session_value) {
 				if ( in_array($session_key, $optional_keys) ) {
 					unset($session_data[$session_key]);
 				}
 			}
 		}
 
 		return $session_data;
 	}
 
 	/**
 	 * Returns real session data, that was saved
 	 *
 	 * @param Array $session_data
 	 * @return Array
 	 * @access protected
 	 */
 	protected function _getRealSessionData($session_data)
 	{
 		$data_keys = array_keys($session_data);
 		$optional_keys = array_keys($this->OptionalData);
 		$real_keys = array_diff($data_keys, $optional_keys);
 
 		if ( !$real_keys ) {
 			return Array ();
 		}
 
 		$ret = Array ();
 
 		foreach ($real_keys as $real_key) {
 			$ret[$real_key] = $session_data[$real_key];
 		}
 
 		return $ret;
 	}
 
 	function PrintSession($comment = '')
 	{
 		if ( defined('DEBUG_MODE') && $this->Application->isDebugMode() && kUtil::constOn('DBG_SHOW_SESSIONDATA') ) {
 			// dump session data
 			$this->Application->Debugger->appendHTML('SessionStorage [' . ($this->RecallVar('admin') == 1 ? 'Admin' : 'Front-End') . '] (' . $comment . '):');
 
 			$session_data = $this->getSessionData();
 			$this->Application->Debugger->dumpVars($session_data);
 
 			if ( !$this->RecallVar('admin') ) {
 				// dump real keys (only for front-end)
 				$real_session_data = $this->_getRealSessionData($session_data);
 
 				if ( $real_session_data ) {
 					$this->Application->Debugger->appendHTML('Real Keys:');
 					$this->Application->Debugger->dumpVars($real_session_data);
 				}
 			}
 		}
 
 		if ( defined('DEBUG_MODE') && $this->Application->isDebugMode() && kUtil::constOn('DBG_SHOW_PERSISTENTDATA') ) {
 			// dump persistent session data
 			if ( $this->Storage->PersistentVars ) {
 				$this->Application->Debugger->appendHTML('Persistant Session:');
 				$session_data = $this->Storage->PersistentVars;
 				ksort($session_data);
 				foreach ($session_data as $session_key => $session_value) {
 					if ( kUtil::IsSerialized($session_value) ) {
 						$session_data[$session_key] = unserialize($session_value);
 					}
 				}
 				$this->Application->Debugger->dumpVars($session_data);
 			}
 		}
 	}
 
 	function SaveData($params = Array ())
 	{
 		if (!$this->SetSession()) { // call it here - it may be not set before, because there was no need; if there is a need, it will be set here
 			return;
 		}
 
 		if (!$this->Application->GetVar('skip_last_template') && $this->Application->GetVar('ajax') != 'yes') {
 			$this->SaveLastTemplate( $this->Application->GetVar('t'), $params );
 		}
 
 		$this->PrintSession('after save');
 		$this->Storage->SaveData();
 	}
 
 	/**
 	 * Save last template
 	 *
 	 * @param string $t
 	 * @param Array $params
 	 */
 	function SaveLastTemplate($t, $params = Array ())
 	{
 		$wid = $this->Application->GetVar('m_wid');
 
 		$last_env = $this->getLastTemplateENV($t, array('m_opener' => 'u'));
 		$last_template = basename($_SERVER['PHP_SELF']) . '|' . $last_env;
 		$this->StoreVar(rtrim('last_template_' . $wid, '_'), $last_template);
 
 		// prepare last_template for opener stack, module & session could be added later
 		$last_env = $this->getLastTemplateENV($t);
 		$last_template = basename($_SERVER['PHP_SELF']) . '|' . $last_env;
 
 		// save last_template in persistent session
 		if (!$wid) {
 			if ($this->Application->isAdmin) {
 				// only for main window, not popups, not login template, not temp mode (used in adm:MainFrameLink tag)
 				$temp_mode = false;
 				$passed = explode(',', $this->Application->GetVar('passed'));
 				foreach ($passed as $passed_prefix) {
 					if ($this->Application->GetVar($passed_prefix.'_mode')) {
 						$temp_mode = true;
 						break;
 					}
 				}
 
 				if (!$temp_mode) {
 					if ( $this->Application->GetVarDirect('section', 'Get') !== false ) {
 						// check directly in GET, because LinkVar (session -> request) used on these vars
 						$last_template .= '&section='.$this->Application->GetVar('section').'&module='.$this->Application->GetVar('module');
 					}
 
 					$this->StorePersistentVar('last_template_popup', $last_template);
 				}
 			}
 			elseif ($this->Application->GetVar('admin')) {
 				// admin checking by session data to prevent recursive session save
 				static $admin_saved = null;
 
 				if (!$this->RecallVar('admin') && !isset($admin_saved)) {
 					// bug: we get recursion in this place, when cookies are disabled in browser and we are browsing
 					// front-end in admin's frame (front-end session is initialized using admin's sid and they are
 					// mixed together)
 
 					$admin_saved = true;
 
+					/** @var Session $admin_session */
 					$admin_session = $this->Application->recallObject('Session.admin');
-					/* @var $admin_session Session */
 
 					// save to admin last_template too, because when F5 is pressed in frameset Front-End frame should reload as well
 
 					$admin_session->StoreVar('last_template_popup', '../' . $last_template);
 					$admin_session->StorePersistentVar('last_template_popup', '../' . $last_template);
 					$admin_session->SaveData( Array ('save_last_template' => false) );
 				}
 				else {
 					// don't allow admin=1 & editing_mode=* to get in admin last_template
 					$last_template = preg_replace('/&(admin|editing_mode)=[\d]/', '', $last_template);
 				}
 			}
 		}
 
 		// save other last... variables for mystical purposes (customizations may be)
 		$this->StoreVar('last_url', $_SERVER['REQUEST_URI']); // needed by ord:StoreContinueShoppingLink
 		$this->StoreVar('last_env', $last_env);
 
 		$save_last_template = array_key_exists('save_last_template', $params) ? $params['save_last_template'] : true;
 
 		if ($save_last_template) {
 			// save last template here, because section & module could be added before
 			$this->StoreVar(rtrim('last_template_popup_'.$wid, '_'), $last_template);
 		}
 	}
 
 	protected function getLastTemplateENV($t, $params = null)
 	{
 		if (!isset($params)) {
 			$params = Array ();
 		}
 
 		if ($this->Application->GetVar('admin') && !array_key_exists('admin', $params) && !defined('EDITING_MODE')) {
 			$params['editing_mode'] = ''; // used in kApplication::Run
 		}
 
 		$params = array_merge($this->Application->getPassThroughVariables($params), $params);
 
 		return $this->Application->BuildEnv($t, $params, 'all', false, false);
 	}
 
 	/**
 	 * Stores variable $val in session under name $var
 	 *
 	 * Use this method to store variable in session. Later this variable could be recalled.
 	 *
 	 * @param string $name Variable name
 	 * @param mixed $value Variable value
 	 * @param bool $optional
 	 * @return void
 	 * @access public
 	 * @see Session::RecallVar()
 	 */
 	public function StoreVar($name, $value, $optional = false)
 	{
 		$this->Data->Set($name, $value);
 
 		if ( $optional ) {
 			// make variable optional, also remember optional value
 			$this->OptionalData[$name] = $value;
 		}
 		elseif ( !$optional && array_key_exists($name, $this->OptionalData) ) {
 			if ( $this->OptionalData[$name] == $value ) {
 				// same value as optional -> don't remove optional mark
 				return;
 			}
 
 			// make variable non-optional
 			unset($this->OptionalData[$name]);
 		}
 	}
 
 	/**
 	 * Stores variable to persistent session
 	 *
 	 * @param string $name
 	 * @param mixed $value
 	 * @param bool $optional
 	 * @return void
 	 * @access public
 	 */
 	public function StorePersistentVar($name, $value, $optional = false)
 	{
 		$this->Storage->StorePersistentVar($name, $value, $optional);
 	}
 
 	function LoadPersistentVars()
 	{
 		$this->Storage->LoadPersistentVars();
 	}
 
 	/**
 	 * Stores default value for session variable
 	 *
 	 * @param string $name
 	 * @param string $value
 	 * @param bool $optional
 	 * @return void
 	 * @access public
 	 * @see Session::RecallVar()
 	 * @see Session::StoreVar()
 	 */
 	public function StoreVarDefault($name, $value, $optional = false)
 	{
 		$tmp = $this->RecallVar($name);
 
 		if ( $tmp === false || $tmp == '' ) {
 			$this->StoreVar($name, $value, $optional);
 		}
 	}
 
 	/**
 	 * Returns session variable value
 	 *
 	 * Return value of $var variable stored in Session. An optional default value could be passed as second parameter.
 	 *
 	 * @param string $name Variable name
 	 * @param mixed $default Default value to return if no $var variable found in session
 	 * @return mixed
 	 * @access public
 	 */
 	public function RecallVar($name, $default = false)
 	{
 		$ret = $this->Data->Get($name);
 
 		return ($ret === false) ? $default : $ret;
 	}
 
 	/**
 	 * Returns variable value from persistent session
 	 *
 	 * @param string $name
 	 * @param mixed $default
 	 * @return mixed
 	 * @access public
 	 */
 	public function RecallPersistentVar($name, $default = false)
 	{
 		return $this->Storage->RecallPersistentVar($name, $default);
 	}
 
 	/**
 	 * Deletes Session variable
 	 *
 	 * @param string $var
 	 * @return void
 	 * @access public
 	 */
 	public function RemoveVar($name)
 	{
 		$this->Storage->RemoveFromData($name);
 		$this->Data->Remove($name);
 	}
 
 	/**
 	 * Removes variable from persistent session
 	 *
 	 * @param string $name
 	 * @return void
 	 * @access public
 	 */
 	public function RemovePersistentVar($name)
 	{
 		$this->Storage->RemovePersistentVar($name);
 	}
 
 	/**
 	 * Ignores session variable value set before
 	 *
 	 * @param string $name
 	 * @return void
 	 * @access public
 	 */
 	public function RestoreVar($name)
 	{
 		$value = $this->Storage->GetFromData($name, '__missing__');
 
 		if ( $value === '__missing__' ) {
 			// there is nothing to restore (maybe session was not saved), look in optional variable values
 			$value = array_key_exists($name, $this->OptionalData) ? $this->OptionalData[$name] : false;
 		}
 
 		$this->StoreVar($name, $value);
 	}
 
 	function GetField($var_name, $default = false)
 	{
 		return $this->Storage->GetField($var_name, $default);
 	}
 
 	function SetField($var_name, $value)
 	{
 		$this->Storage->SetField($var_name, $value);
 	}
 
 	/**
 	 * Deletes expired sessions
 	 *
 	 * @return Array	expired sids if any
 	 * @access private
 	 */
 	function DeleteExpired()
 	{
 		return $this->Storage->DeleteExpired();
 	}
 
 	/**
 	 * Deletes given sessions
 	 *
 	 * @param $session_ids
 	 * @param int $delete_reason
 	 * @return void
 	 */
 	function DeleteSessions($session_ids, $delete_reason = SESSION_LOG_EXPIRED)
 	{
 		$this->Storage->DeleteSessions($session_ids, $delete_reason);
 	}
 
 	/**
 	 * Allows to check if user in this session is logged in or not
 	 *
 	 * @return bool
 	 */
 	function LoggedIn()
 	{
 		$user_id = $this->RecallVar('user_id');
 
 		$ret = $user_id > 0;
 		if (($this->RecallVar('admin') == 1 || defined('ADMIN')) && ($user_id == USER_ROOT)) {
 			$ret = true;
 		}
 		return $ret;
 	}
 
 }
Index: branches/5.3.x/core/kernel/db/cat_dbitem.php
===================================================================
--- branches/5.3.x/core/kernel/db/cat_dbitem.php	(revision 16518)
+++ branches/5.3.x/core/kernel/db/cat_dbitem.php	(revision 16519)
@@ -1,632 +1,632 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class kCatDBItem extends kDBItem {
 
 	/**
 	 * Category path, needed for import
 	 *
 	 * @var Array
 	 */
 	var $CategoryPath = Array();
 
 	/**
 	 * Use automatic filename generation
 	 *
 	 * @var bool
 	 */
 	var $useFilenames = true;
 
 	/**
 	 * Use pending editing abilities during item (delegated by permissions)
 	 *
 	 * @var bool
 	 */
 	var $usePendingEditing = false;
 
 	/**
 	 * Removes all data from an object
 	 *
 	 * @param int $new_id
 	 * @return bool
 	 * @access public
 	 */
 	public function Clear($new_id = null)
 	{
 		parent::Clear($new_id);
 		$this->CategoryPath = Array();
 	}
 
 	/**
 	 * Set's prefix and special
 	 *
 	 * @param string $prefix
 	 * @param string $special
 	 * @access public
 	 */
 	function Init($prefix, $special)
 	{
 		parent::Init($prefix, $special);
 
 		$this->usePendingEditing = $this->getUnitConfig()->getUsePendingEditing();
 	}
 
 	/**
 	 * Assigns primary category for the item
 	 *
 	 * @access public
 	 */
 	public function assignPrimaryCategory()
 	{
 		if ( $this->GetDBField('CategoryId') <= 0 ) {
 			// set primary category in item object
 			$this->SetDBField('CategoryId', $this->Application->GetVar('m_cat_id'));
 		}
 
 		$this->assignToCategory($this->GetDBField('CategoryId'), true);
 	}
 
 	/**
 	 * Updates previously loaded record with current item' values
 	 *
 	 * @access public
 	 * @param int $id Primary Key Id to update
 	 * @param Array $update_fields
 	 * @param bool $system_update
 	 * @return bool
 	 * @access public
 	 */
 	public function Update($id = null, $update_fields = null, $system_update = false)
 	{
 		if ( $this->useFilenames ) {
 			$this->checkFilename();
 			$this->generateFilename();
 		}
 
 		$ret = parent::Update($id, $update_fields, $system_update);
 
 		if ( $ret ) {
 			$filename = $this->useFilenames ? (string)$this->GetDBField('Filename') : '';
 			$sql = 'UPDATE ' . $this->CategoryItemsTable() . '
 					SET Filename = ' . $this->Conn->qstr($filename) . '
 					WHERE ItemResourceId = ' . $this->GetDBField('ResourceId');
 			$this->Conn->Query($sql);
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Returns CategoryItems table based on current item mode (temp/live)
 	 *
 	 * @return string
 	 */
 	function CategoryItemsTable()
 	{
 		$table = TABLE_PREFIX.'CategoryItems';
 		if ($this->Application->IsTempTable($this->TableName)) {
 			$table = $this->Application->GetTempName($table, 'prefix:'.$this->Prefix);
 		}
 
 		return $table;
 	}
 
 	function checkFilename()
 	{
 		if( !$this->GetDBField('AutomaticFilename') )
 		{
 			$filename = $this->GetDBField('Filename');
 			$this->SetDBField('Filename', $this->stripDisallowed($filename) );
 		}
 	}
 
 	function Copy($cat_id=null)
 	{
 		if (!isset($cat_id)) $cat_id = $this->Application->GetVar('m_cat_id');
 		$this->NameCopy($cat_id);
 		return $this->Create($cat_id);
 	}
 
 	/**
 	 * Sets new name for item in case if it is being copied in same table
 	 *
 	 * @param array $master Table data from TempHandler
 	 * @param int $foreign_key ForeignKey value to filter name check query by
 	 * @param string $title_field FieldName to alter, by default - TitleField of the prefix
 	 * @param string $format sprintf-style format of renaming pattern, by default Copy %1$s of %2$s which makes it Copy [Number] of Original Name
 	 * @access public
 	 */
 	public function NameCopy($master=null, $foreign_key=null, $title_field=null, $format='Copy %1$s of %2$s')
 	{
 		$title_field = $this->getUnitConfig()->getTitleField();
 		if (!$title_field) return;
 
 		$new_name = $this->GetDBField($title_field);
 		$cat_id = (int)$this->Application->GetVar('m_cat_id');
 		$original_checked = false;
 		do {
 			if ( preg_match('/Copy ([0-9]*) *of (.*)/', $new_name, $regs) ) {
 				$new_name = 'Copy '.( (int)$regs[1] + 1 ).' of '.$regs[2];
 			}
 			elseif ($original_checked) {
 				$new_name = 'Copy of '.$new_name;
 			}
 			$query = 'SELECT '.$title_field.' FROM '.$this->TableName.'
 								LEFT JOIN '.TABLE_PREFIX.'CategoryItems ON
 								('.TABLE_PREFIX.'CategoryItems.ItemResourceId = '.$this->TableName.'.ResourceId)
 								WHERE ('.TABLE_PREFIX.'CategoryItems.CategoryId = '.$cat_id.') AND '.
 								$title_field.' = '.$this->Conn->qstr($new_name);
 			$res = $this->Conn->GetOne($query);
 			$original_checked = true;
 		} while ($res !== false);
 		$this->SetDBField($title_field, $new_name);
 
 		// this is needed, because Create will create items in its own CategoryId (if it's set),
 		// but we need to create it in target Paste category @see{kCatDBItem::Create} and its primary_category detection
 		$this->SetDBField('CategoryId', $cat_id);
 	}
 
 	/**
 	 * Changes item primary category to given/current category
 	 *
 	 * @param int $category_id
 	 */
 	function MoveToCat($category_id = null)
 	{
 //		$this->NameCopy();
 		if (!isset($category_id)) {
 			$category_id = $this->Application->GetVar('m_cat_id');
 		}
 
 		$table_name = TABLE_PREFIX . 'CategoryItems';
 		if ($this->IsTempTable()) {
 			$table_name = $this->Application->GetTempName($table_name, 'prefix:' . $this->Prefix);
 		}
 
 		// check if the item already exists in destination category
 		$sql = 'SELECT PrimaryCat
 				FROM ' . $table_name . '
 				WHERE (CategoryId = ' . (int)$category_id . ') AND (ItemResourceId = ' . $this->GetDBField('ResourceId') . ')';
 		$is_primary = $this->Conn->GetOne($sql);
 
 		// if it's not found is_primary will be FALSE, if it's found but not primary it will be int 0
 		$exists = $is_primary !== false;
 
 		if ($exists) {
 			// if the item already exists in destination category
 			if ($is_primary) {
 				// do nothing when we paste to primary
 				return ;
 			}
 
 			// if it's not primary - delete it from destination category, as we will move it from current primary below
 			$sql = 'DELETE FROM ' . $table_name . '
 					WHERE (CategoryId = ' . (int)$category_id . ') AND (ItemResourceId = ' . $this->GetDBField('ResourceId') . ')';
 			$this->Conn->Query($sql);
 		}
 
 		// change category id in existing primary category record
 		$sql = 'UPDATE ' . $table_name . '
 				SET CategoryId = ' . (int)$category_id . '
 				WHERE (ItemResourceId = ' . $this->GetDBField('ResourceId') . ') AND (PrimaryCat = 1)';
 		$this->Conn->Query($sql);
 
 		$this->Update();
 	}
 
 	/**
 	 * When item is deleted, then also delete it from all categories
 	 *
 	 * @param int $id
 	 * @return bool
 	 * @access public
 	 */
 	public function Delete($id = null)
 	{
 		if ( isset($id) ) {
 			$this->setID($id);
 		}
 
 		$this->Load($this->GetID());
 
 		$ret = parent::Delete();
 
 		if ( $ret ) {
 			// TODO: move to OnAfterItemDelete method
 			$query = '	DELETE FROM ' . $this->CategoryItemsTable() . '
 						WHERE ItemResourceId = ' . $this->GetDBField('ResourceId');
 			$this->Conn->Query($query);
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Deletes item from categories
 	 *
 	 * @param Array $delete_category_ids
 	 * @author Alex
 	 */
 	function DeleteFromCategories($delete_category_ids)
 	{
 		$id_field = $this->getUnitConfig()->getIDField(); // because item was loaded before by ResourceId
 
 		$ci_table = $this->Application->getUnitConfig($this->Prefix . '-ci')->getTableName();
 		$resource_id = $this->GetDBField('ResourceId');
 
 		$item_cats_sql = '	SELECT CategoryId
 							FROM %s
 							WHERE ItemResourceId = %s';
 
 		$delete_category_items_sql = '	DELETE FROM %s
 										WHERE ItemResourceId = %s AND CategoryId IN (%s)';
 
 		$category_ids = $this->Conn->GetCol( sprintf($item_cats_sql, $ci_table, $resource_id) );
 		$cats_left = array_diff($category_ids, $delete_category_ids);
 
 		if ( !$cats_left ) {
 			$sql = 'SELECT %s
 					FROM %s
 					WHERE ResourceId = %s';
 			$ids = $this->Conn->GetCol(sprintf($sql, $id_field, $this->TableName, $resource_id));
 
+			/** @var kTempTablesHandler $temp_handler */
 			$temp_handler = $this->Application->recallObject($this->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler');
-			/* @var $temp_handler kTempTablesHandler */
 
 			$temp_handler->DeleteItems($this->Prefix, $this->Special, $ids);
 		}
 		else {
 			$this->Conn->Query( sprintf($delete_category_items_sql, $ci_table, $resource_id, implode(',', $delete_category_ids)) );
 
 			$sql = 'SELECT CategoryId
 					FROM %s
 					WHERE PrimaryCat = 1 AND ItemResourceId = %s';
 			$primary_cat_id = $this->Conn->GetCol(sprintf($sql, $ci_table, $resource_id));
 
 			if ( count($primary_cat_id) == 0 ) {
 				$sql = 'UPDATE %s
 						SET PrimaryCat = 1
 						WHERE (CategoryId = %s) AND (ItemResourceId = %s)';
 				$this->Conn->Query( sprintf($sql, $ci_table, reset($cats_left), $resource_id) );
 			}
 		}
 	}
 
 	/**
 	 * replace not allowed symbols with "_" chars + remove duplicate "_" chars in result
 	 *
 	 * @param string $filename
 	 * @return string
 	 */
 	function stripDisallowed($filename)
 	{
+		/** @var kFilenamesHelper $filenames_helper */
 		$filenames_helper = $this->Application->recallObject('FilenamesHelper');
-		/* @var $filenames_helper kFilenamesHelper */
 
 		$table = $this->IsTempTable() ? $this->Application->GetTempName(TABLE_PREFIX.'CategoryItems', 'prefix:'.$this->Prefix) : TABLE_PREFIX.'CategoryItems';
 
 		return $filenames_helper->stripDisallowed($table, 'ItemResourceId', $this->GetDBField('ResourceId'), $filename);
 	}
 
 	/* commented out because it's called only from stripDisallowed body, which is moved to helper
 
 	function checkAutoFilename($filename)
 	{
 		$filenames_helper = $this->Application->recallObject('FilenamesHelper');
 		return $filenames_helper->checkAutoFilename($this->TableName, $this->IDField, $this->GetID(), $filename);
 	}*/
 
 	/**
 	 * Generate item's filename based on it's title field value
 	 *
 	 * @return void
 	 * @access protected
 	 */
 	protected function generateFilename()
 	{
 		if ( !$this->GetDBField('AutomaticFilename') && $this->GetDBField('Filename') ) {
 			return ;
 		}
 
 		$title_field = $this->getUnitConfig()->getTitleField();
 
 		if ( preg_match('/l([\d]+)_(.*)/', $title_field, $regs) ) {
 			// if title field is multilingual, then use it's name from primary language
 			$title_field = 'l' . $this->Application->GetDefaultLanguageId() . '_' . $regs[2];
 		}
 
 		$name = $this->stripDisallowed( $this->GetDBField($title_field) );
 
 		if ( $name != $this->GetDBField('Filename') ) {
 			$this->SetDBField('Filename', $name);
 		}
 	}
 
 	/**
 	 * Adds item to other category
 	 *
 	 * @param int $category_id
 	 * @param bool $is_primary
 	 * @return void
 	 * @access public
 	 */
 	public function assignToCategory($category_id, $is_primary = false)
 	{
 		$table = $this->CategoryItemsTable();
 		$key_clause = '(ItemResourceId = ' . $this->GetDBField('ResourceId') . ')';
 
 		// get all categories, where item is in
 		$sql = 'SELECT PrimaryCat, CategoryId
 				FROM ' . $table . '
 				WHERE ' . $key_clause;
 		$item_categories = $this->Conn->GetCol($sql, 'CategoryId');
 
 		$primary_found = $item_category_id = false;
 
 		if ( $item_categories ) {
 			// find primary category
 			foreach ($item_categories as $item_category_id => $primary_found) {
 				if ( $primary_found ) {
 					break;
 				}
 			}
 		}
 
 		if ( $primary_found && ($item_category_id == $category_id) && !$is_primary ) {
 			// want to make primary category as non-primary :(
 			return;
 		}
 		elseif ( !$primary_found ) {
 			$is_primary = true;
 		}
 
 		if ( $is_primary && $item_categories ) {
 			// reset primary mark from all other categories
 			$sql = 'UPDATE ' . $table . '
 					SET PrimaryCat = 0
 					WHERE ' . $key_clause;
 			$this->Conn->Query($sql);
 		}
 
 		// UPDATE & INSERT instead of REPLACE because CategoryItems table has no primary key defined in database
 		if ( isset($item_categories[$category_id]) ) {
 			$sql = 'UPDATE ' . $table . '
 					SET PrimaryCat = ' . ($is_primary ? 1 : 0) . '
 					WHERE ' . $key_clause . ' AND (CategoryId = ' . $category_id . ')';
 			$this->Conn->Query($sql);
 		}
 		else {
 			$fields_hash = 	Array (
 				'CategoryId'		=>	$category_id,
 				'ItemResourceId'	=>	$this->GetField('ResourceId'),
 				'PrimaryCat'		=>	$is_primary ? 1 : 0,
 				'ItemPrefix'		=>	$this->Prefix,
 				'Filename'			=>	$this->useFilenames ? (string)$this->GetDBField('Filename') : '', // because some prefixes does not use filenames,
 			);
 
 			if ( $this->Application->IsTempTable($table) ) {
 				$new_id = (int)$this->Conn->GetOne('SELECT MIN(Id) FROM ' . $table .' WHERE Id < 0' );
 				$fields_hash['Id'] = $new_id - 1;
 			}
 
 			$this->Conn->doInsert($fields_hash, $table);
 		}
 
 		// to ensure filename update after adding to another category
 		// this is critical since there may be an item with same filename in newly added category!
 		$this->Update();
 	}
 
 	/**
 	 * Removes item from category specified
 	 *
 	 * @param int $category_id
 	 */
 	function removeFromCategory($category_id)
 	{
 		$sql = 'DELETE FROM '.TABLE_PREFIX.'CategoryItems WHERE (CategoryId = %s) AND (ItemResourceId = %s)';
 		$this->Conn->Query( sprintf($sql, $category_id, $this->GetDBField('ResourceId')) );
 	}
 
 	/**
 	 * Returns list of columns, that could exist in imported file
 	 *
 	 * @return Array
 	 */
 	function getPossibleExportColumns()
 	{
 		static $columns = null;
 		if (!is_array($columns)) {
 			$columns = array_merge($this->Fields['AvailableColumns']['options'], $this->Fields['ExportColumns']['options']);
 		}
 		return $columns;
 	}
 
 	/**
 	 * Returns item's primary image data
 	 *
 	 * @return Array
 	 */
 	function getPrimaryImageData()
 	{
 		$sql = 'SELECT *
 				FROM '.TABLE_PREFIX.'CatalogImages
 				WHERE (ResourceId = '.$this->GetDBField('ResourceId').') AND (DefaultImg = 1)';
 		$image_data = $this->Conn->GetRow($sql);
 		if (!$image_data) {
 			// 2. no primary image, then get image with name "main"
 			$sql = 'SELECT *
 				FROM '.TABLE_PREFIX.'CatalogImages
 				WHERE (ResourceId = '.$this->GetDBField('ResourceId').') AND (Name = "main")';
 			$image_data = $this->Conn->GetRow($sql);
 		}
 		return $image_data;
 	}
 
 	function ChangeStatus($new_status, $pending_editing = false)
 	{
 		$status_field = $this->getUnitConfig()->getStatusField(true);
 
 		if ($new_status != $this->GetDBField($status_field)) {
 			// status was changed
 			$this->sendEmails($new_status, $pending_editing);
 		}
 
 		$this->SetDBField($status_field, $new_status);
 
 		return $this->Update();
 	}
 
 	function sendEmails($new_status, $pending_editing = false)
 	{
 		$config = $this->getUnitConfig();
 
 		$owner_field = $config->getOwnerField('CreatedById');
 		$event_name = $config->getPermItemPrefix();
 
 		if ($pending_editing) {
 			$event_name .= '.MODIFY';
 		}
 
 		$event_name .= $new_status == STATUS_ACTIVE ? '.APPROVE' : '.DENY';
 		$this->Application->emailUser($event_name, $this->GetDBField($owner_field), $this->getEmailParams());
 	}
 
 	/**
 	 * Approves changes made to category item
 	 *
 	 * @return bool
 	 */
 	function ApproveChanges()
 	{
 		$original_id = $this->GetDBField('OrgId');
 
 		if ( !($this->usePendingEditing && $original_id) ) {
 			// non-pending copy of original link
 			return $this->ChangeStatus(STATUS_ACTIVE);
 		}
 
 		if ( $this->raiseEvent('OnBeforeDeleteOriginal', null, Array ('original_id' => $original_id)) ) {
 			// delete original item, because changes made in pending copy (this item) got to be approved in this method
+			/** @var kTempTablesHandler $temp_handler */
 			$temp_handler = $this->Application->recallObject($this->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler');
-			/* @var $temp_handler kTempTablesHandler */
 
 			$temp_handler->DeleteItems($this->Prefix, $this->Special, Array ($original_id));
 
 			$this->raiseEvent('OnAfterDeleteOriginal', null, Array ('original_id' => $original_id));
 			$this->SetDBField('OrgId', 0);
 
 			return $this->ChangeStatus(STATUS_ACTIVE, true);
 		}
 
 		return false;
 	}
 
 	/**
 	 * Decline changes made to category item
 	 *
 	 * @return bool
 	 */
 	function DeclineChanges()
 	{
 		$original_id = $this->GetDBField('OrgId');
 
 		if ( !($this->usePendingEditing && $original_id) ) {
 			// non-pending copy of original link
 			return $this->ChangeStatus(STATUS_DISABLED);
 		}
 
 		// delete this item, because changes made in pending copy (this item) will be declined in this method
+		/** @var kTempTablesHandler $temp_handler */
 		$temp_handler = $this->Application->recallObject($this->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler');
-		/* @var $temp_handler kTempTablesHandler */
 
 		$temp_handler->DeleteItems($this->Prefix, $this->Special, Array ($this->GetID()));
 
 		$this->sendEmails(STATUS_DISABLED, true);
 		// original item is not changed here, because it is already enabled (thrus pending copy is visible to item's owner or admin with permission)
 		return true;
 	}
 
 	function RegisterHit()
 	{
 		$already_viewed = $this->Application->RecallVar($this->getPrefixSpecial().'_already_viewed');
 		$already_viewed = $already_viewed ? unserialize($already_viewed) : Array ();
 
 		$id = $this->GetID();
 		if (!in_array($id, $already_viewed)) {
 			$property_map = $this->getUnitConfig()->getItemPropertyMappings(Array ());
 
 			if (!$property_map) {
 				return ;
 			}
 
 			$hits_field = $property_map['ClickField'];
 			$new_hits = $this->GetDBField($hits_field) + 1;
 
 			$sql = 'SELECT MAX('.$hits_field.')
 					FROM '.$this->TableName.'
 					WHERE FLOOR('.$hits_field.') = '.$new_hits;
 			$max_hits = $this->Conn->GetOne($sql);
 
 			if ($max_hits) {
 				$new_hits = $max_hits + 0.000001;
 			}
 
 			$fields_hash = Array ($hits_field => $new_hits,);
 			$this->Conn->doUpdate($fields_hash, $this->TableName, $this->IDField.' = '.$id);
 
 			array_push($already_viewed, $id);
 			$this->Application->StoreVar($this->getPrefixSpecial().'_already_viewed', serialize($already_viewed));
 		}
 	}
 
 	/**
 	 * Returns part of SQL WHERE clause identifying the record, ex. id = 25
 	 *
 	 * @param string $method Child class may want to know who called GetKeyClause, Load(), Update(), Delete() send its names as method
 	 * @param Array $keys_hash alternative, then item id, keys hash to load item by
 	 * @see kDBItem::Load()
 	 * @see kDBItem::Update()
 	 * @see kDBItem::Delete()
 	 * @return string
 	 * @access protected
 	 */
 	protected function GetKeyClause($method = null, $keys_hash = null)
 	{
 		if ( $method == 'load' && !isset($keys_hash) ) {
 			// for item with many categories makes primary to load
 			$ci_table = TABLE_PREFIX . 'CategoryItems';
 
 			if ($this->IsTempTable()) {
 				$ci_table = $this->Application->GetTempName($ci_table, 'prefix:' . $this->Prefix);
 			}
 
 			if ( $this->Application->isAdmin ) {
 				// When coping new item from temp table, where no CategoryItems record present yet.
 				return parent::GetKeyClause($method, $keys_hash) . ' ORDER BY `' . $ci_table . '`.PrimaryCat DESC';
 			}
 			else {
 				// Ensures, that CategoryId calculated field has primary category id in it.
 				$keys_hash = Array (
 					$this->IDField => $this->ID,
 					'`' . $ci_table . '`.`PrimaryCat`' => 1
 				);
 			}
 		}
 
 		return parent::GetKeyClause($method, $keys_hash);
 	}
 }
Index: branches/5.3.x/core/kernel/db/db_load_balancer.php
===================================================================
--- branches/5.3.x/core/kernel/db/db_load_balancer.php	(revision 16518)
+++ branches/5.3.x/core/kernel/db/db_load_balancer.php	(revision 16519)
@@ -1,884 +1,884 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class kDBLoadBalancer extends kBase implements IDBConnection {
 
 	/**
 	 * Current database type
 	 *
 	 * @var string
 	 * @access protected
 	 */
 	protected $dbType = 'mysqli';
 
 	/**
 	 * Function to handle sql errors
 	 *
 	 * @var mixed
 	 * @access protected
 	 */
 	protected $errorHandler = '';
 
 	/**
 	 * Database connection settings
 	 *
 	 * @var Array
 	 * @access protected
 	 */
 	protected $servers = Array ();
 
 	/**
 	 * Load of each slave server, given
 	 *
 	 * @var Array
 	 * @access protected
 	 */
 	protected $serverLoads = Array ();
 
 	/**
 	 * Caches replication lag of servers
 	 *
 	 * @var Array
 	 * @access protected
 	 */
 	protected $serverLagTimes = Array ();
 
 	/**
 	 * Connection references to opened connections
 	 *
 	 * @var Array
 	 * @access protected
 	 */
 	protected $connections = Array ();
 
 	/**
 	 * Index of last user slave connection
 	 *
 	 * @var int
 	 * @access protected
 	 */
 	protected $slaveIndex = false;
 
 	/**
 	 * Index of the server, that was used last
 	 *
 	 * @var int
 	 * @access protected
 	 */
 	protected $lastUsedIndex = 0;
 
 	/**
 	 * Consider slave down if it isn't responding for N milliseconds
 	 *
 	 * @var int
 	 * @access protected
 	 */
 	protected $DBClusterTimeout = 10;
 
 	/**
 	 * Scale load balancer polling time so that under overload conditions, the database server
 	 * receives a SHOW STATUS query at an average interval of this many microseconds
 	 *
 	 * @var int
 	 * @access protected
 	 */
 	protected $DBAvgStatusPoll = 2000;
 
 	/**
 	 * Indicates, that next database query could be cached, when memory caching is enabled
 	 *
 	 * @var bool
 	 * @access public
 	 */
 	public $nextQueryCachable = false;
 
 	/**
 	 * Indicates, that next query should be sent to maser database
 	 *
 	 * @var bool
 	 */
 	public $nextQueryFromMaster = false;
 
 	/**
 	 * Creates new instance of load balancer class
 	 *
 	 * @param string $db_type
 	 * @param mixed $error_handler
 	 */
 	function __construct($db_type, $error_handler = '')
 	{
 		parent::__construct();
 
 		$this->dbType = $db_type;
 		$this->setErrorHandler($error_handler);
 
 		$this->DBClusterTimeout *= 1e6; // convert to milliseconds
 	}
 
 	/**
 	 * Sets new error handler.
 	 *
 	 * @param mixed $error_handler Error handler.
 	 *
 	 * @return self
 	 */
 	public function setErrorHandler($error_handler)
 	{
 		$this->errorHandler = $error_handler;
 
 		return $this;
 	}
 
 	/**
 	 * Setups load balancer according given configuration.
 	 *
 	 * @param Array $config
 	 * @return void
 	 * @access public
 	 */
 	public function setup($config)
 	{
 		$this->servers = Array ();
 
 		$this->servers[0] = Array (
 			'DBHost' => $config['Database']['DBHost'],
 			'DBUser' => $config['Database']['DBUser'],
 			'DBUserPassword' => $config['Database']['DBUserPassword'],
 			'DBName' => $config['Database']['DBName'],
 			'DBLoad' => 0,
 		);
 
 		if ( isset($config['Databases']) ) {
 			$this->servers = array_merge($this->servers, $config['Databases']);
 		}
 
 		foreach ($this->servers as $server_index => $server_setting) {
 			$this->serverLoads[$server_index] = $server_setting['DBLoad'];
 		}
 	}
 
 	/**
 	 * Returns connection index to master database
 	 *
 	 * @return int
 	 * @access protected
 	 */
 	protected function getMasterIndex()
 	{
 		return 0;
 	}
 
 	/**
 	 * Returns connection index to slave database. This takes into account load ratios and lag times.
 	 * Side effect: opens connections to databases
 	 *
 	 * @return int
 	 * @access protected
 	 */
 	protected function getSlaveIndex()
 	{
 		if ( count($this->servers) == 1 || $this->Application->isAdmin ) {
 			// skip the load balancing if there's only one server OR in admin console
 			return 0;
 		}
 		elseif ( $this->slaveIndex !== false ) {
 			// shortcut if generic reader exists already
 			return $this->slaveIndex;
 		}
 
 		$total_elapsed = 0;
 		$non_error_loads = $this->serverLoads;
 		$i = $found = $lagged_slave_mode = false;
 
 		// first try quickly looking through the available servers for a server that meets our criteria
 		do {
 			$current_loads = $non_error_loads;
 			$overloaded_servers = $total_threads_connected = 0;
 
 			while ($current_loads) {
 				if ( $lagged_slave_mode ) {
 					// when all slave servers are too lagged, then ignore lag and pick random server
 					$i = $this->pickRandom($current_loads);
 				}
 				else {
 					$i = $this->getRandomNonLagged($current_loads);
 
 					if ( $i === false && $current_loads )  {
 						// all slaves lagged -> pick random lagged slave then
 						$lagged_slave_mode = true;
 						$i = $this->pickRandom( $current_loads );
 					}
 				}
 
 				if ( $i === false ) {
 					// all slaves are down -> use master as a slave
 					$this->slaveIndex = $this->getMasterIndex();
 
 					return $this->slaveIndex;
 				}
 
 				$conn =& $this->openConnection($i);
 
 				if ( !$conn ) {
 					unset($non_error_loads[$i], $current_loads[$i]);
 					continue;
 				}
 
 				// Perform post-connection backoff
 				$threshold = isset($this->servers[$i]['DBMaxThreads']) ? $this->servers[$i]['DBMaxThreads'] : false;
 				$backoff = $this->postConnectionBackoff($conn, $threshold);
 
 				if ( $backoff ) {
 					// post-connection overload, don't use this server for now
 					$total_threads_connected += $backoff;
 					$overloaded_servers++;
 
 					unset( $current_loads[$i] );
 				}
 				else {
 					// return this server
 					break 2;
 				}
 			}
 
 			// no server found yet
 			$i = false;
 
 			// if all servers were down, quit now
 			if ( !$non_error_loads ) {
 				break;
 			}
 
 			// back off for a while
 			// scale the sleep time by the number of connected threads, to produce a roughly constant global poll rate
 			$avg_threads = $total_threads_connected / $overloaded_servers;
 
 			usleep($this->DBAvgStatusPoll * $avg_threads);
 			$total_elapsed += $this->DBAvgStatusPoll * $avg_threads;
 		} while ( $total_elapsed < $this->DBClusterTimeout );
 
 		if ( $i !== false ) {
 			// slave connection successful
 			if ( $this->slaveIndex <= 0 && $this->serverLoads[$i] > 0 && $i !== false ) {
 				$this->slaveIndex = $i;
 			}
 		}
 
 		return $i;
 	}
 
 	/**
 	 * Returns random non-lagged server
 	 *
 	 * @param Array $loads
 	 * @return int
 	 * @access protected
 	 */
 	protected function getRandomNonLagged($loads)
 	{
 		// unset excessively lagged servers
 		$lags = $this->getLagTimes();
 
 		foreach ($lags as $i => $lag) {
 			if ( $i != 0 && isset($this->servers[$i]['DBMaxLag']) ) {
 				if ( $lag === false ) {
 					unset( $loads[$i] ); // server is not replicating
 				}
 				elseif ( $lag > $this->servers[$i]['DBMaxLag'] ) {
 					unset( $loads[$i] ); // server is excessively lagged
 				}
 			}
 		}
 
 		// find out if all the slaves with non-zero load are lagged
 		if ( !$loads || array_sum($loads) == 0 ) {
 			return false;
 		}
 
 		// return a random representative of the remainder
 		return $this->pickRandom($loads);
 	}
 
 	/**
 	 * Select an element from an array of non-normalised probabilities
 	 *
 	 * @param Array $weights
 	 * @return int
 	 * @access protected
 	 */
 	protected function pickRandom($weights)
 	{
 		if ( !is_array($weights) || !$weights ) {
 			return false;
 		}
 
 		$sum = array_sum($weights);
 
 		if ( $sum == 0 ) {
 			return false;
 		}
 
 		$max = mt_getrandmax();
 		$rand = mt_rand(0, $max) / $max * $sum;
 
 		$index = $sum = 0;
 
 		foreach ($weights as $index => $weight) {
 			$sum += $weight;
 
 			if ( $sum >= $rand ) {
 				break;
 			}
 		}
 
 		return $index;
 	}
 
 	/**
 	 * Get lag time for each server
 	 * Results are cached for a short time in memcached, and indefinitely in the process cache
 	 *
 	 * @return Array
 	 * @access protected
 	 */
 	protected function getLagTimes()
 	{
 		if ( $this->serverLagTimes ) {
 			return $this->serverLagTimes;
 		}
 
 		$expiry = 5;
 		$request_rate = 10;
 
 		$cache_key = 'lag_times:' . $this->servers[0]['DBHost'];
 		$times = $this->Application->getCache($cache_key);
 
 		if ( $times ) {
 			// randomly recache with probability rising over $expiry
 			$elapsed = time() - $times['timestamp'];
 			$chance = max(0, ($expiry - $elapsed) * $request_rate);
 
 			if ( mt_rand(0, $chance) != 0 ) {
 				unset( $times['timestamp'] );
 				$this->serverLagTimes = $times;
 
 				return $times;
 			}
 		}
 
 		// cache key missing or expired
 		$times = Array();
 
 		foreach ($this->servers as $index => $server) {
 			if ($index == 0) {
 				$times[$index] = 0; // master
 			}
 			else {
 				$conn =& $this->openConnection($index);
 
 				if ($conn !== false) {
 					$times[$index] = $conn->getSlaveLag();
 				}
 			}
 		}
 
 		// add a timestamp key so we know when it was cached
 		$times['timestamp'] = time();
 		$this->Application->setCache($cache_key, $times, $expiry);
 
 		// but don't give the timestamp to the caller
 		unset($times['timestamp']);
 		$this->serverLagTimes = $times;
 
 		return $this->serverLagTimes;
 	}
 
 	/**
 	 * Determines whatever server should not be used, even, when connection was made
 	 *
 	 * @param kDBConnection $conn
 	 * @param int $threshold
 	 * @return int
 	 * @access protected
 	 */
 	protected function postConnectionBackoff(&$conn, $threshold)
 	{
 		if ( !$threshold ) {
 			return 0;
 		}
 
 		$status = $conn->getStatus('Thread%');
 
 		return $status['Threads_running'] > $threshold ? $status['Threads_connected'] : 0;
 	}
 
 	/**
 	 * Open a connection to the server given by the specified index
 	 * Index must be an actual index into the array.
 	 * If the server is already open, returns it.
 	 *
 	 * On error, returns false.
 	 *
 	 * @param integer $i Server index
 	 * @return kDBConnection|false
 	 * @access protected
 	 */
 	protected function &openConnection($i)
 	{
 		if ( isset($this->connections[$i]) ) {
 			$conn =& $this->connections[$i];
 		}
 		else {
 			$server = $this->servers[$i];
 			$server['serverIndex'] = $i;
 			$conn =& $this->reallyOpenConnection($server, $i == $this->getMasterIndex());
 
 			if ( $conn->connectionOpened ) {
 				$this->connections[$i] =& $conn;
 				$this->lastUsedIndex = $i;
 			}
 			else {
 				$conn = false;
 			}
 		}
 
 		if ( $this->nextQueryCachable && is_object($conn) ) {
 			$conn->nextQueryCachable = true;
 			$this->nextQueryCachable = false;
 		}
 
 		return $conn;
 	}
 
 	/**
 	 * Checks if previous query execution raised an error.
 	 *
 	 * @return bool
 	 * @access public
 	 */
 	public function hasError()
 	{
 		$conn =& $this->openConnection($this->lastUsedIndex);
 
 		return $conn->hasError();
 	}
 
 	/**
 	 * Checks if connection to the server given by the specified index is opened.
 	 *
 	 * @param integer $i Server index
 	 * @return bool
 	 * @access public
 	 */
 	public function connectionOpened($i = null)
 	{
 		$conn =& $this->openConnection(isset($i) ? $i : $this->getMasterIndex());
 
 		return $conn ? $conn->connectionOpened : false;
 	}
 
 	/**
 	 * Really opens a connection.
 	 * Returns a database object whether or not the connection was successful.
 	 *
 	 * @param Array $server
 	 * @param bool $is_master
 	 * @return kDBConnection
 	 */
 	protected function &reallyOpenConnection($server, $is_master)
 	{
 		$debug_mode = $this->Application->isDebugMode();
 		$db_class = $debug_mode ? 'kDBConnectionDebug' : 'kDBConnection';
 
+		/** @var kDBConnection $db */
 		$db = $this->Application->makeClass($db_class, Array ($this->dbType, $this->errorHandler, $server['serverIndex']));
-		/* @var $db kDBConnection */
 
 		$db->debugMode = $debug_mode;
 		$db->Connect($server['DBHost'], $server['DBUser'], $server['DBUserPassword'], $this->servers[0]['DBName'], !$is_master);
 
 		return $db;
 	}
 
 	/**
 	 * Returns first field of first line of recordset if query ok or false otherwise.
 	 *
 	 * @param string $sql
 	 * @param int $offset
 	 * @return string
 	 * @access public
 	 */
 	public function GetOne($sql, $offset = 0)
 	{
 		$conn =& $this->chooseConnection($sql);
 
 		return $conn->GetOne($sql, $offset);
 	}
 
 	/**
 	 * Returns first row of recordset if query ok, false otherwise.
 	 *
 	 * @param string $sql
 	 * @param int $offset
 	 * @return Array
 	 * @access public
 	 */
 	public function GetRow($sql, $offset = 0)
 	{
 		$conn =& $this->chooseConnection($sql);
 
 		return $conn->GetRow($sql, $offset);
 	}
 
 	/**
 	 * Returns 1st column of recordset as one-dimensional array or false otherwise.
 	 *
 	 * Optional parameter $key_field can be used to set field name to be used as resulting array key.
 	 *
 	 * @param string $sql
 	 * @param string $key_field
 	 * @return Array
 	 * @access public
 	 */
 	public function GetCol($sql, $key_field = null)
 	{
 		$conn =& $this->chooseConnection($sql);
 
 		return $conn->GetCol($sql, $key_field);
 	}
 
 	/**
 	 * Returns iterator for 1st column of a recordset or false in case of error.
 	 *
 	 * Optional parameter $key_field can be used to set field name to be used as resulting array key.
 	 *
 	 * @param string $sql
 	 * @param string $key_field
 	 * @return bool|kMySQLQueryCol
 	 */
 	public function GetColIterator($sql, $key_field = null)
 	{
 		$conn =& $this->chooseConnection($sql);
 
 		return $conn->GetColIterator($sql, $key_field);
 	}
 
 	/**
 	 * Queries db with $sql query supplied and returns rows selected if any, false otherwise.
 	 *
 	 * Optional parameter $key_field allows to set one of the query fields value as key in string array.
 	 *
 	 * @param string $sql
 	 * @param string $key_field
 	 * @param bool $no_debug
 	 * @return Array
 	 * @access public
 	 */
 	public function Query($sql, $key_field = null, $no_debug = false)
 	{
 		$conn =& $this->chooseConnection($sql);
 
 		return $conn->Query($sql, $key_field, $no_debug);
 	}
 
 	/**
 	 * Returns iterator to a recordset, produced from running $sql query.
 	 *
 	 * Queries db with $sql query supplied and returns kMySQLQuery iterator or false in case of error.
 	 * Optional parameter $key_field allows to set one of the query fields value as key in string array.
 	 *
 	 * @param string $sql
 	 * @param string $key_field
 	 * @param bool   $no_debug
 	 * @param string $iterator_class
 	 * @return kMySQLQuery|bool
 	 * @access public
 	 */
 	public function GetIterator($sql, $key_field = null, $no_debug = false, $iterator_class = 'kMySQLQuery')
 	{
 		$conn =& $this->chooseConnection($sql);
 
 		return $conn->GetIterator($sql, $key_field, $no_debug, $iterator_class);
 	}
 
 	/**
 	 * Free memory used to hold recordset handle.
 	 *
 	 * @access public
 	 */
 	public function Destroy()
 	{
 		$conn =& $this->openConnection($this->lastUsedIndex);
 
 		$conn->Destroy();
 	}
 
 	/**
 	 * Performs sql query, that will change database content.
 	 *
 	 * @param string $sql
 	 * @return bool
 	 * @access public
 	 */
 	public function ChangeQuery($sql)
 	{
 		$conn =& $this->chooseConnection($sql);
 
 		return $conn->ChangeQuery($sql);
 	}
 
 	/**
 	 * Returns auto increment field value from insert like operation if any, zero otherwise.
 	 *
 	 * @return int
 	 * @access public
 	 */
 	public function getInsertID()
 	{
 		$conn =& $this->openConnection($this->lastUsedIndex);
 
 		return $conn->getInsertID();
 	}
 
 	/**
 	 * Returns row count affected by last query.
 	 *
 	 * @return int
 	 * @access public
 	 */
 	public function getAffectedRows()
 	{
 		$conn =& $this->openConnection($this->lastUsedIndex);
 
 		return $conn->getAffectedRows();
 	}
 
 	/**
 	 * Returns LIMIT sql clause part for specific db.
 	 *
 	 * @param int $offset
 	 * @param int $rows
 	 * @return string
 	 * @access public
 	 */
 	public function getLimitClause($offset, $rows)
 	{
 		$conn =& $this->openConnection($this->lastUsedIndex);
 
 		return $conn->getLimitClause($offset, $rows);
 	}
 
 	/**
 	 * If it's a string, adds quotes and backslashes. Otherwise returns as-is.
 	 *
 	 * @param mixed $string
 	 * @return string
 	 * @access public
 	 */
 	public function qstr($string)
 	{
 		$conn =& $this->openConnection($this->lastUsedIndex);
 
 		return $conn->qstr($string);
 	}
 
 	/**
 	 * Calls "qstr" function for each given array element.
 	 *
 	 * @param Array $array
 	 * @param string $function
 	 * @return Array
 	 */
 	public function qstrArray($array, $function = 'qstr')
 	{
 		$conn =& $this->openConnection($this->lastUsedIndex);
 
 		return $conn->qstrArray($array, $function);
 	}
 
 	/**
 	 * Escapes string.
 	 *
 	 * @param mixed $string
 	 * @return string
 	 * @access public
 	 */
 	public function escape($string)
 	{
 		$conn =& $this->openConnection($this->lastUsedIndex);
 
 		return $conn->escape($string);
 	}
 
 	/**
 	 * Returns last error code occurred.
 	 *
 	 * @return int
 	 * @access public
 	 */
 	public function getErrorCode()
 	{
 		$conn =& $this->openConnection($this->lastUsedIndex);
 
 		return $conn->getErrorCode();
 	}
 
 	/**
 	 * Returns last error message.
 	 *
 	 * @return string
 	 * @access public
 	 */
 	public function getErrorMsg()
 	{
 		$conn =& $this->openConnection($this->lastUsedIndex);
 
 		return $conn->getErrorMsg();
 	}
 
 	/**
 	 * Performs insert of given data (useful with small number of queries)
 	 * or stores it to perform multiple insert later (useful with large number of queries).
 	 *
 	 * @param Array $fields_hash
 	 * @param string $table
 	 * @param string $type
 	 * @param bool $insert_now
 	 * @return bool
 	 * @access public
 	 */
 	public function doInsert($fields_hash, $table, $type = 'INSERT', $insert_now = true)
 	{
 		$conn =& $this->openConnection( $this->getMasterIndex() );
 
 		return $conn->doInsert($fields_hash, $table, $type, $insert_now);
 	}
 
 	/**
 	 * Update given field values to given record using $key_clause.
 	 *
 	 * @param Array $fields_hash
 	 * @param string $table
 	 * @param string $key_clause
 	 * @return bool
 	 * @access public
 	 */
 	public function doUpdate($fields_hash, $table, $key_clause)
 	{
 		$conn =& $this->openConnection( $this->getMasterIndex() );
 
 		return $conn->doUpdate($fields_hash, $table, $key_clause);
 	}
 
 	/**
 	 * Allows to detect table's presence in database.
 	 *
 	 * @param string $table_name
 	 * @param bool $force
 	 * @return bool
 	 * @access public
 	 */
 	public function TableFound($table_name, $force = false)
 	{
 		$conn =& $this->openConnection($this->lastUsedIndex);
 
 		return $conn->TableFound($table_name, $force);
 	}
 
 	/**
 	 * Returns query processing statistics.
 	 *
 	 * @return Array
 	 * @access public
 	 */
 	public function getQueryStatistics()
 	{
 		$conn =& $this->openConnection($this->lastUsedIndex);
 
 		return $conn->getQueryStatistics();
 	}
 
 	/**
 	 * Get status information from SHOW STATUS in an associative array.
 	 *
 	 * @param string $which
 	 * @return Array
 	 * @access public
 	 */
 	public function getStatus($which = '%')
 	{
 		$conn =& $this->openConnection($this->lastUsedIndex);
 
 		return $conn->getStatus($which);
 	}
 
 	/**
 	 * When undefined method is called, then send it directly to last used slave server connection
 	 *
 	 * @param string $name
 	 * @param Array $arguments
 	 * @return mixed
 	 * @access public
 	 */
 	public function __call($name, $arguments)
 	{
 		$conn =& $this->openConnection($this->lastUsedIndex);
 
 		return call_user_func_array( Array (&$conn, $name), $arguments );
     }
 
     /**
      * Returns appropriate connection based on sql
      *
      * @param string $sql
      * @return kDBConnection
 	 * @access protected
      */
     protected function &chooseConnection($sql)
     {
     	if ( $this->nextQueryFromMaster ) {
 			$this->nextQueryFromMaster = false;
 			$index = $this->getMasterIndex();
 		}
 		else {
 			$sid = isset($this->Application->Session) ? $this->Application->GetSID() : '9999999999999999999999';
 
 			if ( preg_match('/(^[ \t\r\n]*(ALTER|CREATE|DROP|RENAME|DELETE|DO|INSERT|LOAD|REPLACE|TRUNCATE|UPDATE))|ses_' . $sid . '/', $sql) ) {
 				$index = $this->getMasterIndex();
 			}
 			else {
 				$index = $this->getSlaveIndex();
 			}
 		}
 
 		$this->lastUsedIndex = $index;
 		$conn =& $this->openConnection($index);
 
 		return $conn;
     }
 
 	/**
 	 * Get slave replication lag. It will only work if the DB user has the PROCESS privilege.
 	 *
 	 * @return int
 	 * @access public
 	 */
 	public function getSlaveLag()
 	{
 		$conn =& $this->openConnection($this->lastUsedIndex);
 
 		return $conn->getSlaveLag();
 	}
 }
Index: branches/5.3.x/core/kernel/db/db_tag_processor.php
===================================================================
--- branches/5.3.x/core/kernel/db/db_tag_processor.php	(revision 16518)
+++ branches/5.3.x/core/kernel/db/db_tag_processor.php	(revision 16519)
@@ -1,3128 +1,3128 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class kDBTagProcessor extends kTagProcessor {
 
 	/**
 	 * Mapping between "list_name" tag attribute values and generated Specials.
 	 *
 	 * @var array
 	 */
 	protected $nameToSpecialMapping = array();
 
 	/**
 	 * Returns true if "new" button was pressed in toolbar
 	 *
 	 * @param Array $params
 	 * @return bool
 	 */
 	function IsNewMode($params)
 	{
 		$object = $this->getObject($params);
 		return $object->GetID() <= 0;
 	}
 
 	/**
 	 * Returns view menu name for current prefix
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function GetItemName($params)
 	{
 		$item_name = $this->getUnitConfig()->getViewMenuPhrase();
 
 		return $this->Application->Phrase($item_name);
 	}
 
 	function ViewMenu($params)
 	{
 		$block_params = $params;
 		unset($block_params['block']);
 		$block_params['name'] = $params['block'];
 
 		$list =& $this->GetList($params);
 		$block_params['PrefixSpecial'] = $list->getPrefixSpecial();
 		return $this->Application->ParseBlock($block_params);
 	}
 
 	function SearchKeyword($params)
 	{
 		$list =& $this->GetList($params);
 
 		return $this->Application->RecallVar($list->getPrefixSpecial() . '_search_keyword');
 	}
 
 	/**
 	 * Draw filter menu content (for ViewMenu) based on filters defined in config
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function DrawFilterMenu($params)
 	{
 		$block_params = $this->prepareTagParams($params);
 		$block_params['name'] = $params['spearator_block'];
 		$separator = $this->Application->ParseBlock($block_params);
 		$filter_menu = $this->getUnitConfig()->getFilterMenu();
 
 		if ( !$filter_menu ) {
 			trigger_error('<span class="debug_error">no filters defined</span> for prefix <b>' . $this->Prefix . '</b>, but <b>DrawFilterMenu</b> tag used', E_USER_NOTICE);
 
 			return '';
 		}
 
 		// Params: label, filter_action, filter_status
 		$block_params['name'] = $params['item_block'];
 
 		$view_filter = $this->Application->RecallVar($this->getPrefixSpecial() . '_view_filter');
 		if ( $view_filter === false ) {
 			$this->Application->HandleEvent(new kEvent($this->getPrefixSpecial() . ':OnRemoveFilters'));
 			$view_filter = $this->Application->RecallVar($this->getPrefixSpecial() . '_view_filter');
 		}
 
 		$view_filter = unserialize($view_filter);
 
 		$filters = Array ();
 		$prefix_special = $this->getPrefixSpecial();
 
 		foreach ($filter_menu['Filters'] as $filter_key => $filter_params) {
 			$group_params = isset($filter_params['group_id']) ? $filter_menu['Groups'][$filter_params['group_id']] : Array ();
 			if ( !isset($group_params['element_type']) ) {
 				$group_params['element_type'] = 'checkbox';
 			}
 
 			if ( !$filter_params ) {
 				$filters[] = $separator;
 				continue;
 			}
 
 			$block_params['label'] = $filter_params['label'];
 
 			if ( getArrayValue($view_filter, $filter_key) ) {
 				$submit = 0;
 				if ( isset($params['old_style']) ) {
 					$status = $group_params['element_type'] == 'checkbox' ? 1 : 2;
 				}
 				else {
 					$status = $group_params['element_type'] == 'checkbox' ? '[\'img/check_on.gif\']' : '[\'img/menu_dot.gif\']';
 				}
 			}
 			else {
 				$submit = 1;
 				$status = 'null';
 			}
 
 			$block_params['filter_action'] = 'set_filter("' . $prefix_special . '","' . $filter_key . '","' . $submit . '",' . $params['ajax'] . ');';
 			$block_params['filter_status'] = $status; // 1 - checkbox, 2 - radio, 0 - no image
 			$filters[] = $this->Application->ParseBlock($block_params);
 		}
 
 		return implode('', $filters);
 	}
 
 	/**
 	 * Draws auto-refresh submenu in View Menu.
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function DrawAutoRefreshMenu($params)
 	{
 		$refresh_intervals = $this->Application->ConfigValue('AutoRefreshIntervals');
 		if (!$refresh_intervals) {
 			trigger_error('<span class="debug_error">no refresh intervals defined</span> for prefix <strong>'.$this->Prefix.'</strong>, but <strong>DrawAutoRefreshMenu</strong> tag used', E_USER_NOTICE);
 			return '';
 		}
 
 		$refresh_intervals = explode(',', $refresh_intervals);
 		$view_name = $this->Application->RecallVar($this->getPrefixSpecial().'_current_view');
 		$current_refresh_interval = $this->Application->RecallPersistentVar($this->getPrefixSpecial().'_refresh_interval.'.$view_name);
 		if ($current_refresh_interval === false) {
 			// if no interval was selected before, then choose 1st interval
 			$current_refresh_interval = $refresh_intervals[0];
 		}
 
 		$ret = '';
 		$block_params = $this->prepareTagParams($params);
 		$block_params['name'] = $params['render_as'];
 
 		foreach ($refresh_intervals as $refresh_interval) {
 			$block_params['label'] = $this->_formatInterval($refresh_interval);
 			$block_params['refresh_interval'] = $refresh_interval;
 			$block_params['selected'] = $current_refresh_interval == $refresh_interval;
 			$ret .= $this->Application->ParseBlock($block_params);
 		}
 		return $ret;
 	}
 
 	/**
 	 * Tells, that current grid is using auto refresh
 	 *
 	 * @param Array $params
 	 * @return bool
 	 */
 	function UseAutoRefresh($params)
 	{
 		$view_name = $this->Application->RecallVar($this->getPrefixSpecial().'_current_view');
 		return $this->Application->RecallPersistentVar($this->getPrefixSpecial().'_auto_refresh.'.$view_name);
 	}
 
 	/**
 	 * Returns current grid refresh interval
 	 *
 	 * @param Array $params
 	 * @return bool
 	 */
 	function AutoRefreshInterval($params)
 	{
 		$view_name = $this->Application->RecallVar($this->getPrefixSpecial().'_current_view');
 		return $this->Application->RecallPersistentVar($this->getPrefixSpecial().'_refresh_interval.'.$view_name);
 	}
 
 	/**
 	 * Formats time interval using given text for hours and minutes
 	 *
 	 * @param int $interval minutes
 	 * @param string $hour_text Text for hours
 	 * @param string $min_text Text for minutes
 	 * @return string
 	 */
 	function _formatInterval($interval, $hour_text = 'h', $min_text = 'min')
 	{
 		// 65
 		$minutes = $interval % 60;
 		$hours = ($interval - $minutes) / 60;
 
 		$ret = '';
 		if ($hours) {
 			$ret .= $hours.$hour_text.' ';
 		}
 
 		if ($minutes) {
 			$ret .= $minutes.$min_text;
 		}
 
 		return $ret;
 	}
 
 	function IterateGridFields($params)
 	{
 		$mode = $params['mode'];
 		$def_block = isset($params['block']) ? $params['block'] : '';
 		$force_block = isset($params['force_block']) ? $params['force_block'] : false;
 
 		$grid = $this->getUnitConfig()->getGridByName($params['grid']);
 		$grid_config = $grid['Fields'];
 
 		$picker_helper = new kColumnPickerHelper($this->getPrefixSpecial(), $params['grid']);
 		$grid_config = $picker_helper->apply($grid_config);
 
 		if ( $mode == 'fields' ) {
 			return "'" . join("','", array_keys($grid_config)) . "'";
 		}
 
 		$object =& $this->GetList($params);
 
 		$o = '';
 		$i = 0;
 
 		foreach ($grid_config as $field => $options) {
 			$i++;
 			$block_params = $this->prepareTagParams($params);
 			$block_params = array_merge($block_params, $options);
 
 			$block_params['block_name'] = array_key_exists($mode . '_block', $block_params) ? $block_params[$mode . '_block'] : $def_block;
 			$block_params['name'] = $force_block ? $force_block : $block_params['block_name'];
 			$block_params['field'] = $field;
 			$block_params['sort_field'] = isset($options['sort_field']) ? $options['sort_field'] : $field;
 			$block_params['filter_field'] = isset($options['filter_field']) ? $options['filter_field'] : $field;
 
 			$w = $picker_helper->getWidth($field);
 
 			if ( $w ) {
 				// column picker width overrides width from unit config
 				$block_params['width'] = $w;
 			}
 
 			$field_options = $object->GetFieldOptions($field);
 			if ( array_key_exists('use_phrases', $field_options) ) {
 				$block_params['use_phrases'] = $field_options['use_phrases'];
 			}
 
 			$block_params['is_last'] = ($i == count($grid_config));
 
 			$o .= $this->Application->ParseBlock($block_params, 1);
 		}
 
 		return $o;
 	}
 
 	function PickerCRC($params)
 	{
 		$picker_helper = new kColumnPickerHelper($this->getPrefixSpecial(), $params['grid']);
 
 		return $picker_helper->getData()->getChecksum();
 	}
 
 	function FreezerPosition($params)
 	{
 		$picker_helper = new kColumnPickerHelper($this->getPrefixSpecial(), $params['grid']);
 		$data = $picker_helper->getData();
 
 		$freezer_pos = $data->getOrder('__FREEZER__');
 
 		return $freezer_pos === false || $data->isHidden('__FREEZER__') ? 1 : ++$freezer_pos;
 	}
 
 	function GridFieldsCount($params)
 	{
 		$grid = $this->getUnitConfig()->getGridByName($params['grid']);
 
 		return count($grid['Fields']);
 	}
 
 	/**
 	 * Prints list content using block specified
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access public
 	 */
 	function PrintList($params)
 	{
 		$params['no_table'] = 1;
 		return $this->PrintList2($params);
 	}
 
 	function InitList($params)
 	{
 		$list_name = isset($params['list_name']) ? $params['list_name'] : '';
 
 		if ( getArrayValue($this->nameToSpecialMapping, $list_name) === false ) {
 			$list =& $this->GetList($params);
 		}
 	}
 
 	function BuildListSpecial($params)
 	{
 		return $this->Special;
 	}
 
 	/**
 	 * Returns key, that identifies each list on template (used internally, not tag)
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function getUniqueListKey($params)
 	{
 		$types = array_key_exists('types', $params) ? $params['types'] : '';
 		$except = array_key_exists('except', $params) ? $params['except'] : '';
 		$list_name = array_key_exists('list_name', $params) ? $params['list_name'] : '';
 
 		if (!$list_name) {
 			$list_name = $this->Application->Parser->GetParam('list_name');
 		}
 
 		return $types . $except . $list_name;
 	}
 
 	/**
 	 * Enter description here...
 	 *
 	 * @param Array $params
 	 * @return kDBList
 	 */
 	function &GetList($params)
 	{
 		$list_name = array_key_exists('list_name', $params) ? $params['list_name'] : '';
 
 		if ( !$list_name ) {
 			$list_name = $this->Application->Parser->GetParam('list_name');
 		}
 
 		$requery = isset($params['requery']) && $params['requery'];
 		$main_list = array_key_exists('main_list', $params) && $params['main_list'];
 
 		if ( $list_name && !$requery ) {
 			// list with "list_name" parameter
 			if ( !array_key_exists($list_name, $this->nameToSpecialMapping) ) {
 				// special missing -> generate one
 				$special = $main_list ? $this->Special : $this->BuildListSpecial($params);
 			}
 			else {
 				// get special, formed during list initialization
 				$special = $this->nameToSpecialMapping[$list_name];
 			}
 		}
 		else {
 			// list without "list_name" parameter
 			$special = $main_list ? $this->Special : $this->BuildListSpecial($params);
 		}
 
 		$prefix_special = rtrim($this->Prefix . '.' . $special, '.');
 		$params['skip_counting'] = true;
 
+		/** @var kDBList $list */
 		$list = $this->Application->recallObject($prefix_special, $this->Prefix . '_List', $params);
-		/* @var $list kDBList */
 
 		if ( !array_key_exists('skip_quering', $params) || !$params['skip_quering'] ) {
 			if ( $requery ) {
 				$this->Application->HandleEvent(new kEvent($prefix_special . ':OnListBuild', $params));
 			}
 
 			if ( array_key_exists('offset', $params) ) {
 				$list->SetOffset($list->GetOffset() + $params['offset']); // apply custom offset
 			}
 
 			$list->Query($requery);
 
 			if ( array_key_exists('offset', $params) ) {
 				$list->SetOffset($list->GetOffset() - $params['offset']); // remove custom offset
 			}
 		}
 
 		$this->Init($this->Prefix, $special);
 
 		if ( $list_name ) {
 			$this->nameToSpecialMapping[$list_name] = $special;
 		}
 
 		return $list;
 	}
 
 	function ListMarker($params)
 	{
 		$list =& $this->GetList($params);
 		$ret = $list->getPrefixSpecial();
 
 		if (array_key_exists('as_preg', $params) && $params['as_preg']) {
 			$ret = preg_quote($ret, '/');
 		}
 
 		return $ret;
 	}
 
 	function CombinedSortingDropDownName($params)
 	{
 		$list =& $this->GetList($params);
 
 		return $list->getPrefixSpecial() . '_CombinedSorting';
 	}
 
 	/**
 	 * Prepares name for field with event in it (used only on front-end)
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function SubmitName($params)
 	{
 		$list =& $this->GetList($params);
 
 		$prefix_special = $list->getPrefixSpecial();
 
 		return 'events[' . $prefix_special . '][' . $params['event'] . ']';
 	}
 
 	/**
 	 * Prints list content using block specified
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access public
 	 */
 	function PrintList2($params)
 	{
 		$per_page = $this->SelectParam($params, 'per_page,max_items');
 		if ( $per_page !== false ) {
 			$params['per_page'] = $per_page;
 		}
 
 		$list =& $this->GetList($params);
 		$o = '';
 
 		$direction = (isset($params['direction']) && $params['direction'] == "H") ? "H" : "V";
 		$columns = (isset($params['columns'])) ? $params['columns'] : 1;
 
 		$config = $this->getUnitConfig();
 		$id_field = (isset($params['id_field'])) ? $params['id_field'] : $config->getIDField();
 
 		if ( $columns > 1 && $direction == 'V' ) {
 			$records_left = array_splice($list->Records, $list->GetSelectedCount()); // because we have 1 more record for "More..." link detection (don't need to sort it)
 			$list->Records = $this->LinearToVertical($list->Records, $columns, $list->GetPerPage());
 			$list->Records = array_merge($list->Records, $records_left);
 		}
 
 		$list->GoFirst();
 
 		$block_params = $this->prepareTagParams($params);
 		$block_params['name'] = $this->SelectParam($params, 'render_as,block');
 		$block_params['pass_params'] = 'true';
 		$block_params['column_width'] = $params['column_width'] = 100 / $columns;
 		$block_start_row_params = $this->prepareTagParams($params);
 		$block_start_row_params['name'] = $this->SelectParam($params, 'row_start_render_as,block_row_start,row_start_block');
 
 		$block_end_row_params = $this->prepareTagParams($params);
 		$block_end_row_params['name'] = $this->SelectParam($params, 'row_end_render_as,block_row_end,row_end_block');
 
 		$block_empty_cell_params = $this->prepareTagParams($params);
 		$block_empty_cell_params['name'] = $this->SelectParam($params, 'empty_cell_render_as,block_empty_cell,empty_cell_block');
 
 		$i = 0;
 
 		$backup_id = $this->Application->GetVar($this->Prefix . '_id');
 		$displayed = Array ();
 		$column_number = 1;
 
 		$cache_mod_rw = $config->getCacheModRewrite() && $this->Application->RewriteURLs() && !$this->Application->isCachingType(CACHING_TYPE_MEMORY);
 
 		$limit = isset($params['limit']) ? $params['limit'] : false;
 
 		while (!$list->EOL() && (!$limit || $i<$limit)) {
 			$this->Application->SetVar($this->getPrefixSpecial() . '_id', $list->GetDBField($id_field)); // for edit/delete links using GET
 			$this->Application->SetVar($this->Prefix . '_id', $list->GetDBField($id_field));
 			$block_params['is_last'] = ($i == $list->GetSelectedCount() - 1);
 			$block_params['last_row'] = ($i + (($i + 1) % $columns) >= $list->GetSelectedCount() - 1);
 			$block_params['not_last'] = !$block_params['is_last']; // for front-end
 
 			if ( $cache_mod_rw ) {
 				$serial_name = $this->Application->incrementCacheSerial($this->Prefix, $list->GetDBField($id_field), false);
 
 				if ( $this->Prefix == 'c' ) {
 					// for listing subcategories in category
 					$this->Application->setCache('filenames[%' . $serial_name . '%]', $list->GetDBField('NamedParentPath'));
 					$this->Application->setCache('category_tree[%CIDSerial:' . $list->GetDBField($id_field) . '%]', $list->GetDBField('TreeLeft') . ';' . $list->GetDBField('TreeRight'));
 				}
 				else {
 					// for listing items in category
 					$this->Application->setCache('filenames[%' . $serial_name . '%]', $list->GetDBField('Filename'));
 
 					$serial_name = $this->Application->incrementCacheSerial('c', $list->GetDBField('CategoryId'), false);
 					$this->Application->setCache('filenames[%' . $serial_name . '%]', $list->GetDBField('CategoryFilename'));
 				}
 			}
 
 			if ( $i % $columns == 0 ) {
 				// record in this iteration is first in row, then open row
 				$column_number = 1;
 				$o .= $block_start_row_params['name'] ? $this->Application->ParseBlock($block_start_row_params) : (!isset($params['no_table']) ? '<tr>' : '');
 			}
 			else {
 				$column_number++;
 			}
 
 			$block_params['first_col'] = $column_number == 1 ? 1 : 0;
 			$block_params['last_col'] = $column_number == $columns ? 1 : 0;
 
 			$block_params['column_number'] = $column_number;
 			$block_params['num'] = ($i + 1);
 
 			$this->PrepareListElementParams($list, $block_params); // new, no need to rewrite PrintList
 			$o .= $this->Application->ParseBlock($block_params);
 			array_push($displayed, $list->GetDBField($id_field));
 
 			if ( $direction == 'V' && $list->GetSelectedCount() % $columns > 0 && $column_number == ($columns - 1) && ceil(($i + 1) / $columns) > $list->GetSelectedCount() % ceil($list->GetSelectedCount() / $columns) ) {
 				// if vertical output, then draw empty cells vertically, not horizontally
 				$o .= $block_empty_cell_params['name'] ? $this->Application->ParseBlock($block_empty_cell_params) : '<td>&nbsp;</td>';
 				$i++;
 			}
 
 			if ( ($i + 1) % $columns == 0 ) {
 				// record in next iteration is first in row too, then close this row
 				$o .= $block_end_row_params['name'] ? $this->Application->ParseBlock($block_end_row_params) : (!isset($params['no_table']) ? '</tr>' : '');
 			}
 
 			if ( $this->Special && $this->Application->hasObject($this->Prefix) ) {
 				// object, produced by "kDBList::linkToParent" method, that otherwise would keep it's id
+				/** @var kDBBase $item */
 				$item = $this->Application->recallObject($this->Prefix);
-				/* @var $item kDBBase */
 
 				if ( $item instanceof kDBItem ) {
 					$this->Application->removeObject($this->Prefix);
 				}
 			}
 
 			$list->GoNext();
 			$i++;
 		}
 
 		// append empty cells in place of missing cells in last row
 		while ($i % $columns != 0) {
 			// until next cell will be in new row append empty cells
 			$o .= $block_empty_cell_params['name'] ? $this->Application->ParseBlock($block_empty_cell_params) : '<td>&nbsp;</td>';
 
 			if ( ($i + 1) % $columns == 0 ) {
 				// record in next iteration is first in row too, then close this row
 				$o .= $block_end_row_params['name'] ? $this->Application->ParseBlock($block_end_row_params) : '</tr>';
 			}
 			$i++;
 		}
 
 		$cur_displayed = $this->Application->GetVar($this->Prefix . '_displayed_ids');
 		if ( !$cur_displayed ) {
 			$cur_displayed = Array ();
 		}
 		else {
 			$cur_displayed = explode(',', $cur_displayed);
 		}
 
 		$displayed = array_unique(array_merge($displayed, $cur_displayed));
 		$this->Application->SetVar($this->Prefix . '_displayed_ids', implode(',', $displayed));
 
 		$this->Application->SetVar($this->Prefix . '_id', $backup_id);
 		$this->Application->SetVar($this->getPrefixSpecial() . '_id', '');
 
 		if ( isset($params['more_link_render_as']) ) {
 			$block_params = $params;
 			$params['render_as'] = $params['more_link_render_as'];
 			$o .= $this->MoreLink($params);
 		}
 
 		return $o;
 	}
 
 	/**
 	 * Returns ID of previous record (related to current) in list.
 	 * Use only on item detail pages.
 	 *
 	 * @param Array $params
 	 * @return int
 	 * @access protected
 	 */
 	protected function PreviousResource($params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
+		/** @var ListHelper $list_helper */
 		$list_helper = $this->Application->recallObject('ListHelper');
-		/* @var $list_helper ListHelper */
 
 		$select_clause = $object->getUnitConfig()->getNavigationSelectClause(null);
 
 		return $list_helper->getNavigationResource($object, $params['list'], false, $select_clause);
 	}
 
 	/**
 	 * Returns ID of next record (related to current) in list.
 	 * Use only on item detail pages.
 	 *
 	 * @param Array $params
 	 * @return int
 	 * @access protected
 	 */
 	protected function NextResource($params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
+		/** @var ListHelper $list_helper */
 		$list_helper = $this->Application->recallObject('ListHelper');
-		/* @var $list_helper ListHelper */
 
 		$select_clause = $object->getUnitConfig()->getNavigationSelectClause(null);
 
 		return $list_helper->getNavigationResource($object, $params['list'], true, $select_clause);
 	}
 
 	/**
 	 * Allows to modify block params & current list record before PrintList parses record
 	 *
 	 * @param kDBList $object
 	 * @param Array $block_params
 	 * @return void
 	 * @access protected
 	 */
 	protected function PrepareListElementParams(&$object, &$block_params)
 	{
 //		$fields_hash =& $object->getCurrentRecord();
 
 	}
 
 	/**
 	 * Renders given block name, when there there is more data in list, then are displayed right now
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function MoreLink($params)
 	{
 		$per_page = $this->SelectParam($params, 'per_page,max_items');
 
 		if ( $per_page !== false ) {
 			$params['per_page'] = $per_page;
 		}
 
 		$list =& $this->GetList($params);
 
 		if ( $list->isCounted() ) {
 			$has_next_page = $list->GetPage() < $list->GetTotalPages();
 		}
 		else {
 			// selected more, then on the page -> has more
 			$has_next_page = $list->GetPerPage() < $list->GetRecordsCount();
 		}
 
 		if ( $has_next_page ) {
 			$block_params = Array ('name' => $this->SelectParam($params, 'render_as,block'));
 
 			return $this->Application->ParseBlock($block_params);
 		}
 
 		return '';
 	}
 
 	function PageLink($params)
 	{
 		static $default_per_page = Array ();
 
+		/** @var kDBList $object */
 		$object =& $this->GetList($params);
-		/* @var $object kDBList */
 
 		// process sorting
 		if ($object->isMainList()) {
 			if (!array_key_exists('sort_by', $params)) {
 				$sort_by = $this->Application->GetVar('sort_by');
 
 				if ($sort_by !== false) {
 					$params['sort_by'] = $sort_by;
 				}
 			}
 		}
 
 		$prefix_special = $this->getPrefixSpecial();
 
 		// process page
 		$page = array_key_exists('page', $params) ? $params['page'] : $this->Application->GetVar($prefix_special . '_Page');
 
 		if (!$page) {
 			// ensure, that page is always present
 			if ($object->isMainList()) {
 				$params[$prefix_special . '_Page'] = $this->Application->GetVar('page', 1);
 			}
 			else {
 				$params[$prefix_special . '_Page'] = 1;
 			}
 		}
 
 		if (array_key_exists('page', $params)) {
 			$params[$prefix_special . '_Page'] = $params['page'];
 			unset($params['page']);
 		}
 
 		// process per-page
 		$per_page = array_key_exists('per_page', $params) ? $params['per_page'] : $this->Application->GetVar($prefix_special . '_PerPage');
 
 		if (!$per_page) {
 			// ensure, that per-page is always present
 			list ($prefix, ) = explode('.', $prefix_special);
 
 			if (!array_key_exists($prefix, $default_per_page)) {
+				/** @var ListHelper $list_helper */
 				$list_helper = $this->Application->recallObject('ListHelper');
-				/* @var $list_helper ListHelper */
 
 				$default_per_page[$prefix] = $list_helper->getDefaultPerPage($prefix);
 			}
 
 			if ($object->isMainList()) {
 				$params[$prefix_special . '_PerPage'] = $this->Application->GetVar('per_page', $default_per_page[$prefix]);
 			}
 			else {
 				$params[$prefix_special . '_PerPage'] = $default_per_page[$prefix];
 			}
 		}
 
 		if (array_key_exists('per_page', $params)) {
 			$params[$prefix_special . '_PerPage'] = $params['per_page'];
 			unset($params['per_page']);
 		}
 
 		if (!array_key_exists('pass', $params)) {
 			$params['pass'] = 'm,' . $prefix_special;
 		}
 
 		// process template
 		$t = array_key_exists('template', $params) ? $params['template'] : '';
 		unset($params['template']);
 
 		if (!$t) {
 			$t = $this->Application->GetVar('t');
 		}
 
 		return $this->Application->HREF($t, '', $params);
 	}
 
 	/**
 	 * Deprecated
 	 *
 	 * @param array $params
 	 * @return int
 	 * @deprecated Parameter "column_width" of "PrintList" tag does that
 	 */
 	function ColumnWidth($params)
 	{
 		$columns = $this->Application->Parser->GetParam('columns');
 
 		return round(100/$columns).'%';
 	}
 
 	/**
 	 * Append prefix and special to tag
 	 * params (get them from tagname) like
 	 * they were really passed as params
 	 *
 	 * @param Array $tag_params
 	 * @return Array
 	 * @access protected
 	 */
 	function prepareTagParams($tag_params = Array())
 	{
 		$ret = $tag_params;
 		$ret['Prefix'] = $this->Prefix;
 		$ret['Special'] = $this->Special;
 		$ret['PrefixSpecial'] = $this->getPrefixSpecial();
 		return $ret;
 	}
 
 	function GetISO($currency, $field_currency = '')
 	{
 		if ( $currency == 'selected' ) {
 			return $this->Application->RecallVar('curr_iso');
 		}
 
 		if ( $currency == 'primary' || $currency == '' ) {
 			return $this->Application->GetPrimaryCurrency();
 		}
 
 		// explicit currency
 		return $currency == 'field' && $field_currency ? $field_currency : $currency;
 	}
 
 	/**
 	 * Convert primary currency to selected (if they are the same, converter will just return)
 	 *
 	 * @param float $value
 	 * @param string $target_iso
 	 * @param string $source_iso
 	 * @return float
 	 */
 	function ConvertCurrency($value, $target_iso, $source_iso = 'PRIMARY')
 	{
+		/** @var CurrencyRates $converter */
 		$converter = $this->Application->recallObject('CurrencyRates');
-		/* @var $converter CurrencyRates */
 
 		return $converter->Convert($value, $source_iso, $target_iso);
 	}
 
 	function AddCurrencySymbol($value, $iso, $decimal_tag = '')
 	{
+		/** @var CurrencyRates $converter */
 		$converter = $this->Application->recallObject('CurrencyRates');
-		/* @var $converter CurrencyRates */
 
 		return $converter->AddCurrencySymbol($value, $iso, $decimal_tag);
 	}
 
 	/**
 	 * Get's requested field value
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access public
 	 */
 	function Field($params)
 	{
 		$field = $this->SelectParam($params, 'name,field');
 
 		if (!$this->Application->isAdmin) {
 			// don't apply kUtil::escape() on any field value on Front-End
 			$params['no_special'] = 'no_special';
 		}
 
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		if (array_key_exists('db', $params) && $params['db']) {
 			$value = $object->GetDBField($field);
 		}
 		else {
 			if (array_key_exists('currency', $params) && $params['currency']) {
 				$source_iso = isset($params['currency_field']) ? $object->GetDBField($params['currency_field']) : 'PRIMARY';
 				$target_iso = $this->GetISO($params['currency'], $source_iso);
 				$original = $object->GetDBField($field);
 
 				$value = $this->ConvertCurrency($original, $target_iso, $source_iso);
 
 				$object->SetDBField($field, $value);
 				$object->SetFieldOption($field, 'converted', true);
 			}
 
 			$format = array_key_exists('format', $params) ? $params['format'] : false;
 			if (!$format || $format == '$format') {
 				$format = NULL;
 			}
 
 			$value = $object->GetField($field, $format);
 
 			if (array_key_exists('negative', $params) && $params['negative']) {
 				if (strpos($value, '-') === 0) {
 					$value = substr($value, 1);
 				}
 				else {
 					$value = '-' . $value;
 				}
 			}
 
 			if (array_key_exists('currency', $params) && $params['currency']) {
 				$decimal_tag = isset($params['decimal_tag']) ? $params['decimal_tag'] : '';
 				$value = $this->AddCurrencySymbol($value, $target_iso, $decimal_tag);
 				$params['no_special'] = 1;
 			}
 		}
 
 		if (!array_key_exists('no_special', $params) || !$params['no_special']) {
 			$value = kUtil::escape($value);
 		}
 
 		if (array_key_exists('checked', $params) && $params['checked']) {
 			$value = ($value == ( isset($params['value']) ? $params['value'] : 1)) ? 'checked' : '';
 		}
 
 		if (array_key_exists('plus_or_as_label', $params) && $params['plus_or_as_label']) {
 			$value = substr($value, 0,1) == '+' ? substr($value, 1) : $this->Application->Phrase($value);
 		}
 		elseif (array_key_exists('as_label', $params) && $params['as_label']) {
 			$value = $this->Application->Phrase($value);
 		}
 
 		$first_chars = $this->SelectParam($params,'first_chars,cut_first');
 
 		if ($first_chars) {
 			$stripped_value = strip_tags($value, $this->SelectParam($params, 'allowed_tags'));
 
 			if ( mb_strlen($stripped_value) > $first_chars ) {
 				$value = preg_replace('/\s+?(\S+)?$/', '', mb_substr($stripped_value, 0, $first_chars + 1)) . ' ...';
 			}
 		}
 
 		if (array_key_exists('nl2br', $params) && $params['nl2br']) {
 			$value = nl2br($value);
 		}
 
 		if ($value != '') {
 			$this->Application->Parser->DataExists = true;
 		}
 
 		if (array_key_exists('currency', $params) && $params['currency']) {
 			// restoring value in original currency, for other Field tags to work properly
 			$object->SetDBField($field, $original);
 		}
 
 		return $value;
 	}
 
 	function FieldHintLabel($params)
 	{
 		if ( isset($params['direct_label']) && $params['direct_label'] ) {
 			$label = $params['direct_label'];
 			$hint = $this->Application->Phrase($label, false);
 		}
 		else {
 			$label = $params['title_label'];
 			$hint = $this->Application->Phrase('hint:' . $label, false);
 		}
 
 		return $hint != strtoupper('!' . $label . '!') ? $hint : ''; // $hint
 	}
 
 	/**
 	 * Returns formatted date + time on current language
 	 *
 	 * @param $params
 	 */
 	function DateField($params)
 	{
 		$field = $this->SelectParam($params, 'name,field');
 
 		if ($field) {
+			/** @var kDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBItem */
 
 			$timestamp = $object->GetDBField($field);
 		}
 		else {
 			$timestamp = $params['value'];
 		}
 
 		$date = $timestamp;
 
 		// prepare phrase replacements
 		$replacements = Array (
 			'l' => 'la_WeekDay',
 			'D' => 'la_WeekDay',
 			'M' => 'la_Month',
 			'F' => 'la_Month',
 		);
 
 		// cases allow to append phrase suffix based on requested case (e.g. Genitive)
 		$case_suffixes = array_key_exists('case_suffixes', $params) ? $params['case_suffixes'] : false;
 
 		if ($case_suffixes) {
 			// apply case suffixes (for russian language only)
 			$case_suffixes = explode(',', $case_suffixes);
 
 			foreach ($case_suffixes as $case_suffux) {
 				list ($replacement_name, $case_suffix_value) = explode('=', $case_suffux, 2);
 				$replacements[$replacement_name] .= $case_suffix_value;
 			}
 		}
 
 		$format = array_key_exists('format', $params) ? $params['format'] : false;
 
 		if (preg_match('/_regional_(.*)/', $format, $regs)) {
+			/** @var kDBItem $language */
 			$language = $this->Application->recallObject('lang.current');
-			/* @var $language kDBItem */
 
 			$format = $language->GetDBField($regs[1]);
 		}
 		elseif (!$format) {
 			$format = null;
 		}
 
 		// escape formats, that are resolved to words by `date`
 		foreach ($replacements as $format_char => $phrase_prefix) {
 			if (strpos($format, $format_char) === false) {
 				unset($replacements[$format_char]);
 				continue;
 			}
 
 			$replacements[$format_char] = $this->Application->Phrase($phrase_prefix . date($format_char, $date));
 			$format = str_replace($format_char, '#' . ord($format_char) . '#', $format);
 		}
 
 		$date_formatted = date($format, $date);
 
 		// unescape formats, that are resolved to words by `date`
 		foreach ($replacements as $format_char => $format_replacement) {
 			$date_formatted = str_replace('#' . ord($format_char) . '#', $format_replacement, $date_formatted);
 		}
 
 		return $date_formatted;
 	}
 
 	function SetField($params)
 	{
 		// <inp2:SetField field="Value" src=p:cust_{$custom_name}"/>
 
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		$dst_field = $this->SelectParam($params, 'name,field');
 		list($prefix_special, $src_field) = explode(':', $params['src']);
 
+		/** @var kDBItem $src_object */
 		$src_object = $this->Application->recallObject($prefix_special);
-		/* @var $src_object kDBItem */
 
 		$object->SetDBField($dst_field, $src_object->GetDBField($src_field));
 	}
 
 	/**
 	 * Depricated
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @deprecated parameter "as_label" of "Field" tag does the same
 	 */
 	function PhraseField($params)
 	{
 		$field_label = $this->Field($params);
 		$translation = $this->Application->Phrase( $field_label );
 		return $translation;
 	}
 
 	function Error($params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		$field = $this->SelectParam($params, 'name,field');
 
 		return $object->GetErrorMsg($field, false);
 	}
 
 	function HasError($params)
 	{
 		if ($params['field'] == 'any') {
+			/** @var kDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBItem */
 
 			$skip_fields = array_key_exists('except', $params) ? $params['except'] : false;
 			$skip_fields = $skip_fields ? explode(',', $skip_fields) : Array();
 
 			return $object->HasErrors($skip_fields);
 		}
 		else {
 			$res = false;
 			$fields = explode(',', $this->SelectParam($params, 'field,fields'));
 
 			foreach ($fields as $field) {
 				// call kDBTagProcessor::Error instead of kDBItem::GetErrorPseudo to have ability to override Error tag
 				$params['field'] = $field;
 				$res = $res || ($this->Error($params) != '');
 			}
 
 			return $res;
 		}
 	}
 
 	/**
 	 * Renders error message block, when there are errors on a form
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function ErrorWarning($params)
 	{
 		if ( !isset($params['field']) ) {
 			$params['field'] = 'any';
 		}
 
 		if ( $this->HasError($params) ) {
 			$params['prefix'] = $this->getPrefixSpecial();
 
 			return $this->Application->ParseBlock($params);
 		}
 
 		return '';
 	}
 
 	function IsRequired($params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		$field = $params['field'];
 		$formatter_class = $object->GetFieldOption($field, 'formatter');
 
 		if ( $formatter_class == 'kMultiLanguage' ) {
+			/** @var kMultiLanguage $formatter */
 			$formatter = $this->Application->recallObject($formatter_class);
-			/* @var $formatter kMultiLanguage */
 
 			$field = $formatter->LangFieldName($field);
 		}
 
 		return $object->isRequired($field);
 	}
 
 	function FieldOption($params)
 	{
 		$object = $this->getObject($params);;
 		$options = $object->GetFieldOptions($params['field']);
 		$ret =  isset($options[$params['option']]) ? $options[$params['option']] : '';
 		if (isset($params['as_label']) && $params['as_label']) $ret = $this->Application->ReplaceLanguageTags($ret);
 		return $ret;
 	}
 
 	/**
 	 * Prints list a all possible field options
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function PredefinedOptions($params)
 	{
+		/** @var kDBList $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBList */
 
 		$field = $params['field'];
 		$value = array_key_exists('value', $params) ? $params['value'] : $object->GetDBField($field);
 		$field_options = $object->GetFieldOptions($field);
 		if (!array_key_exists('options', $field_options) || !is_array($field_options['options'])) {
 			trigger_error('Options not defined for <strong>'.$object->Prefix.'</strong> field <strong>'.$field.'</strong>', E_USER_WARNING);
 			return '';
 		}
 
 		$options = $field_options['options'];
 
 		if ( array_key_exists('has_empty', $params) && $params['has_empty'] ) {
 			$empty_value = array_key_exists('empty_value', $params) ? $params['empty_value'] : '';
 			$empty_label = isset($params['empty_label']) ? $params['empty_label'] : '';
 
 			if ( $empty_label ) {
 				if ( mb_substr($empty_label, 0, 1) == '+' ) {
 					// using plain text instead of phrase label
 					$empty_label = mb_substr($empty_label, 1);
 				}
 				else {
 					$empty_label = $this->Application->Phrase($empty_label, false);
 				}
 			}
 
 			// don't use other array merge function, because they will reset keys !!!
 			$options = kUtil::array_merge_recursive(Array ($empty_value => $empty_label), $options);
 		}
 
 		$block_params = $this->prepareTagParams($params);
 		$block_params['name'] = $this->SelectParam($params, 'render_as,block');
 		$block_params['pass_params'] = 'true';
 		if (method_exists($object, 'EOL') && count($object->Records) == 0) {
 			// for drawing grid column filter
 			$block_params['field_name'] = '';
 		}
 		else {
 			// deprecated (produces warning when used as grid filter), but used in Front-End (submission create), admin (submission view)
 			$block_params['field_name'] = $this->InputName($params);
 		}
 
 		$selected_html = isset($params['selected']) ? $params['selected'] : 'selected';
 		$selected_param_name = array_key_exists('selected_param', $params) ? $params['selected_param'] : false;
 
 		if (!$selected_param_name) {
 			$selected_param_name = $selected_html;
 		}
 
 		$o = '';
 		if (array_key_exists('no_empty', $params) && $params['no_empty'] && !getArrayValue($options, '')) {
 			// removes empty option, when present (needed?)
 			array_shift($options);
 		}
 
 		$selected_option_keys = $this->getSelectedOptionKeys($value);
 
 		if ( isset($params['selected_only']) && $params['selected_only'] ) {
 			$options = $this->getSelectedOptions($options, $selected_option_keys);
 		}
 
 		$column_changed = false;
 		$option_number = $column_number = 1;
 		$option_count = count($options);
 		$column_count = isset($params['columns']) ? $params['columns'] : 1;
 		$options_per_column = ceil($option_count / $column_count);
 
 		$block_params['option_count'] = $option_count;
 
 		foreach ( $options as $option_key => $option_title ) {
 			$block_params['key'] = $option_key;
 			$block_params['option'] = $option_title;
 			$block_params[$selected_param_name] = $this->isOptionSelected($option_key, $selected_option_keys) ? ' ' . $selected_html : '';
 
 			$block_params['column_number'] = $column_number;
 			$block_params['column_changed'] = $column_changed;
 			$block_params['option_number'] = $option_number;
 			$block_params['is_last'] = $option_number == $option_count;
 
 			$o .= $this->Application->ParseBlock($block_params);
 			$column_changed = false;
 			$option_number++;
 
 			if ( $option_number > $column_number * $options_per_column ) {
 				$column_number++;
 				$column_changed = true;
 			}
 		}
 
 		return $o;
 	}
 
 	/**
 	 * Returns unified representation of selected options based on field value.
 	 *
 	 * @param mixed $field_value Field value.
 	 *
 	 * @return array
 	 */
 	protected function getSelectedOptionKeys($field_value)
 	{
 		if ( strpos($field_value, '|') !== false ) {
 			// multiple checkboxes OR multiselect
 			return explode('|', trim($field_value, '|'));
 		}
 
 		// single selection radio OR checkboxes OR dropdown
 		return array("$field_value");
 	}
 
 	/**
 	 * Returns only options, that have been selected.
 	 *
 	 * @param array $options              All options.
 	 * @param array $selected_option_keys Selected options.
 	 *
 	 * @return array
 	 */
 	protected function getSelectedOptions(array $options, array $selected_option_keys)
 	{
 		$ret = array();
 
 		foreach ( $options as $option_key => $option_title ) {
 			if ( $this->isOptionSelected($option_key, $selected_option_keys) ) {
 				$ret[$option_key] = $option_title;
 			}
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Determines if given option is among selected ones.
 	 *
 	 * @param mixed $option_key           Option key.
 	 * @param array $selected_option_keys Selected options.
 	 *
 	 * @return boolean
 	 */
 	protected function isOptionSelected($option_key, array $selected_option_keys)
 	{
 		return in_array("$option_key", $selected_option_keys, true);
 	}
 
 	function PredefinedSearchOptions($params)
 	{
+		/** @var kDBList $object */
 		$object =& $this->GetList($params);
-		/* @var $object kDBList */
 
 		$params['value'] = $this->SearchField($params);
 
 		return $this->PredefinedOptions($params);
 	}
 
 	function Format($params, $object = null)
 	{
 		$field = $this->SelectParam($params, 'name,field');
 
         if ( !isset($object) ) {
+            /** @var kDBItem $object */
             $object = $this->getObject($params);
-            /* @var $object kDBItem */
         }
 
         $options = $object->GetFieldOptions($field);
 		$format = $options[$this->SelectParam($params, 'input_format') ? 'input_format' : 'format'];
 		$formatter_class = array_key_exists('formatter', $options) ? $options['formatter'] : false;
 
 		if ( $formatter_class ) {
+			/** @var kFormatter $formatter */
 			$formatter = $this->Application->recallObject($formatter_class);
-			/* @var $formatter kFormatter */
 
 			$human_format = array_key_exists('human', $params) ? $params['human'] : false;
 			$edit_size = array_key_exists('edit_size', $params) ? $params['edit_size'] : false;
 			$sample = array_key_exists('sample', $params) ? $params['sample'] : false;
 
 			if ( $sample ) {
 				return $formatter->GetSample($field, $options, $object);
 			}
 			elseif ( $human_format || $edit_size ) {
 				$format = $formatter->HumanFormat($format);
 
 				return $edit_size ? strlen($format) : $format;
 			}
 		}
 
 		return $format;
 	}
 
 	/**
 	 * Returns grid padination information
 	 * Can return links to pages
 	 *
 	 * @param Array $params
 	 * @return mixed
 	 */
 	function PageInfo($params)
 	{
+		/** @var kDBList $object */
 		$object =& $this->GetList($params);
-		/* @var $object kDBList */
 
 		$type = $params['type'];
 		unset($params['type']); // remove parameters used only by current tag
 
 		$ret = '';
 		switch ($type) {
 			case 'current':
 				$ret = $object->GetPage();
 				break;
 
 			case 'total':
 				$ret = $object->GetTotalPages();
 				break;
 
 			case 'prev':
 				$ret = $object->GetPage() > 1 ? $object->GetPage() - 1 : false;
 				break;
 
 			case 'next':
 				$ret = $object->GetPage() < $object->GetTotalPages() ? $object->GetPage() + 1 : false;
 				break;
 		}
 
 		if ($ret && isset($params['as_link']) && $params['as_link']) {
 			unset($params['as_link']); // remove parameters used only by current tag
 			$params['page']	= $ret;
 			$current_page = $object->GetPage(); // backup current page
 			$ret = $this->PageLink($params);
 			$this->Application->SetVar($object->getPrefixSpecial().'_Page', $current_page); // restore page
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Print grid pagination using
 	 * block names specified
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access public
 	 */
 	function PrintPages($params)
 	{
 		$list =& $this->GetList($params);
 		$prefix_special = $list->getPrefixSpecial();
 		$total_pages = $list->GetTotalPages();
 
 		if ( $total_pages > 1 ) {
 			$this->Application->Parser->DataExists = true;
 		}
 
 		if ( $total_pages == 0 ) {
 			// display 1st page as selected in case if we have no pages at all
 			$total_pages = 1;
 		}
 
 		$o = '';
 
 		// what are these 2 lines for?
 		$this->Application->SetVar($prefix_special . '_event', '');
 		$this->Application->SetVar($prefix_special . '_id', '');
 
 		$current_page = $list->GetPage(); //  $this->Application->RecallVar($prefix_special.'_Page');
 
 		$block_params = $this->prepareTagParams($params);
 
 		$split = (isset($params['split']) ? $params['split'] : 10);
 		$split_start = $current_page - ceil($split / 2);
 
 		if ( $split_start < 1 ) {
 			$split_start = 1;
 		}
 
 		$split_end = $split_start + $split - 1;
 
 		if ( $split_end > $total_pages ) {
 			$split_end = $total_pages;
 			$split_start = max($split_end - $split + 1, 1);
 		}
 
 		if ( $current_page > 1 ) {
 			$prev_block_params = $this->prepareTagParams($params);
 
 			if ( $total_pages > $split ) {
 				$prev_block_params['page'] = max($current_page - $split, 1);
 				$prev_block_params['name'] = $this->SelectParam($params, 'prev_page_split_render_as,prev_page_split_block');
 
 				if ( $prev_block_params['name'] ) {
 					$this->Application->SetVar($this->getPrefixSpecial() . '_Page', $prev_block_params['page']);
 					$o .= $this->Application->ParseBlock($prev_block_params);
 				}
 			}
 
 			$prev_block_params['name'] = 'page';
 			$prev_block_params['page'] = $current_page - 1;
 			$prev_block_params['name'] = $this->SelectParam($params, 'prev_page_render_as,block_prev_page,prev_page_block');
 
 			if ( $prev_block_params['name'] ) {
 				$this->Application->SetVar($this->getPrefixSpecial() . '_Page', $prev_block_params['page']);
 				$o .= $this->Application->ParseBlock($prev_block_params);
 			}
 		}
 		else {
 			$no_prev_page_block = $this->SelectParam($params, 'no_prev_page_render_as,block_no_prev_page');
 
 			if ( $no_prev_page_block ) {
 				$block_params['name'] = $no_prev_page_block;
 				$o .= $this->Application->ParseBlock($block_params);
 			}
 		}
 
 		$total_records = $list->GetRecordsCount();
 		$separator_params['name'] = $this->SelectParam($params, 'separator_render_as,block_separator');
 
 		for ($i = $split_start; $i <= $split_end; $i++) {
 			$from_record = ($i - 1) * $list->GetPerPage();
 			$to_record = $from_record + $list->GetPerPage();
 
 			if ( $to_record > $total_records ) {
 				$to_record = $total_records;
 			}
 
 			$block_params['from_record'] = $from_record + 1;
 			$block_params['to_record'] = $to_record;
 
 			if ( $i == $current_page ) {
 				$block = $this->SelectParam($params, 'current_render_as,active_render_as,block_current,active_block');
 			}
 			else {
 				$block = $this->SelectParam($params, 'link_render_as,inactive_render_as,block_link,inactive_block');
 			}
 
 			$block_params['name'] = $block;
 			$block_params['page'] = $i;
 			$this->Application->SetVar($this->getPrefixSpecial() . '_Page', $block_params['page']);
 			$o .= $this->Application->ParseBlock($block_params);
 
 			if ( $this->SelectParam($params, 'separator_render_as,block_separator') && $i < $split_end ) {
 				$o .= $this->Application->ParseBlock($separator_params);
 			}
 		}
 
 		if ( $current_page < $total_pages ) {
 			$next_block_params = $this->prepareTagParams($params);
 			$next_block_params['page'] = $current_page + 1;
 			$next_block_params['name'] = $this->SelectParam($params, 'next_page_render_as,block_next_page,next_page_block');
 
 			if ( $next_block_params['name'] ) {
 				$this->Application->SetVar($this->getPrefixSpecial() . '_Page', $next_block_params['page']);
 				$o .= $this->Application->ParseBlock($next_block_params);
 			}
 
 			if ( $total_pages > $split ) {
 				$next_block_params['page'] = min($current_page + $split, $total_pages);
 				$next_block_params['name'] = $this->SelectParam($params, 'next_page_split_render_as,next_page_split_block');
 
 				if ( $next_block_params['name'] ) {
 					$this->Application->SetVar($this->getPrefixSpecial() . '_Page', $next_block_params['page']);
 					$o .= $this->Application->ParseBlock($next_block_params);
 				}
 			}
 		}
 		else {
 			$no_next_page_block = $this->SelectParam($params, 'no_next_page_render_as,block_no_next_page');
 
 			if ( $no_next_page_block ) {
 				$block_params['name'] = $no_next_page_block;
 				$o .= $this->Application->ParseBlock($block_params);
 			}
 		}
 
 		$this->Application->SetVar($this->getPrefixSpecial() . '_Page', $current_page);
 
 		return $o;
 	}
 
 	/**
 	 * Print grid pagination using
 	 * block names specified
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access public
 	 */
 	function PaginationBar($params)
 	{
 		return $this->PrintPages($params);
 	}
 
 	function PerPageBar($params)
 	{
 		$object =& $this->GetList($params);
 
 		$ret = '';
 		$per_pages = explode(';', $params['per_pages']);
 		$block_params = $this->prepareTagParams($params);
 		$block_params['name'] = $params['render_as'];
 
 		foreach ($per_pages as $per_page) {
 			$block_params['per_page'] = $per_page;
 			$this->Application->SetVar($this->getPrefixSpecial() . '_PerPage', $per_page);
 			$block_params['selected'] = $per_page == $object->GetPerPage();
 
 			$ret .= $this->Application->ParseBlock($block_params, 1);
 		}
 
 		$this->Application->SetVar($this->getPrefixSpecial() . '_PerPage', $object->GetPerPage());
 
 		return $ret;
 	}
 
 	/**
 	 * Returns field name (processed by kMultiLanguage formatter
 	 * if required) and item's id from it's IDField or field required
 	 *
 	 * @param Array $params
 	 * @return Array (id,field)
 	 * @access private
 	 */
 	function prepareInputName($params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		$field = $this->SelectParam($params, 'name,field');
 		$formatter_class = $object->GetFieldOption($field, 'formatter');
 
 		if ($formatter_class == 'kMultiLanguage') {
+			/** @var kMultiLanguage $formatter */
 			$formatter = $this->Application->recallObject($formatter_class);
-			/* @var $formatter kMultiLanguage */
 
 			$force_primary = $object->GetFieldOption($field, 'force_primary');
 			$field = $formatter->LangFieldName($field, $force_primary);
 		}
 
 		if (array_key_exists('force_id', $params)) {
 			$id = $params['force_id'];
 		}
 		else {
 			$id_field = array_key_exists('IdField', $params) ? $params['IdField'] : false;
 			$id = $id_field ? $object->GetDBField($id_field) : $object->GetID();
 		}
 
 		return Array($id, $field);
 	}
 
 
 	/**
 	 * Returns input field name to
 	 * be placed on form (for correct
 	 * event processing)
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access public
 	 */
 	function InputName($params)
 	{
 		list($id, $field) = $this->prepareInputName($params);
 
 		$ret = $this->getPrefixSpecial().'['.$id.']['.$field.']';
 
 		if (array_key_exists('as_preg', $params) && $params['as_preg']) {
 			$ret = preg_quote($ret, '/');
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Allows to override various field options through hidden fields with specific names in submit.
 	 * This tag generates this special names
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @author Alex
 	 */
 	function FieldModifier($params)
 	{
 		list($id, $field) = $this->prepareInputName($params);
 
 		$ret = 'field_modifiers['.$this->getPrefixSpecial().']['.$field.']['.$params['type'].']';
 
 		if (array_key_exists('as_preg', $params) && $params['as_preg']) {
 			$ret = preg_quote($ret, '/');
 		}
 
 		if (isset($params['value'])) {
 			$object = $this->getObject($params);
 			$field_modifiers[$field][$params['type']] = $params['value'];
 			$object->ApplyFieldModifiers($field_modifiers);
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Returns index where 1st changeable sorting field begins
 	 *
 	 * @return int
 	 * @access private
 	 */
 	function getUserSortIndex()
 	{
 		$list_sortings = $this->getUnitConfig()->getListSortingsBySpecial($this, Array ());
 
 		$user_sorting_start = 0;
 		$forced_sorting = getArrayValue($list_sortings, 'ForcedSorting');
 
 		return $forced_sorting ? count($forced_sorting) : $user_sorting_start;
 	}
 
 	/**
 	 * Returns order direction for given field
 	 *
 	 *
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access public
 	 */
 	function Order($params)
 	{
 		$field = $params['field'];
 		$user_sorting_start = $this->getUserSortIndex();
 
 		$list =& $this->GetList($params);
 
 		if ($list->GetOrderField($user_sorting_start) == $field)
 		{
 			return strtolower($list->GetOrderDirection($user_sorting_start));
 		}
 		elseif($this->Application->ConfigValue('UseDoubleSorting') && $list->GetOrderField($user_sorting_start+1) == $field)
 		{
 			return '2_'.strtolower($list->GetOrderDirection($user_sorting_start+1));
 		}
 		else
 		{
 			return 'no';
 		}
 	}
 
 	/**
 	 * Detects, that current sorting is not default
 	 *
 	 * @param Array $params
 	 * @return bool
 	 */
 	function OrderChanged($params)
 	{
 		$list =& $this->GetList($params);
 
+		/** @var ListHelper $list_helper */
 		$list_helper = $this->Application->recallObject('ListHelper');
-		/* @var $list_helper ListHelper */
 
 		return $list_helper->hasUserSorting($list);
 	}
 
 	/**
 	 * Gets information of sorting field at "pos" position,
 	 * like sorting field name (type="field") or sorting direction (type="direction")
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function OrderInfo($params)
 	{
 		$user_sorting_start = $this->getUserSortIndex() + --$params['pos'];
 		$list =& $this->GetList($params);
 
 		if ( $params['type'] == 'field' ) {
 			return $list->GetOrderField($user_sorting_start);
 		}
 
 		if ( $params['type'] == 'direction' ) {
 			return $list->GetOrderDirection($user_sorting_start);
 		}
 
 		return '';
 	}
 
 	/**
 	 * Checks if sorting field/direction matches passed field/direction parameter
 	 *
 	 * @param Array $params
 	 * @return bool
 	 * @access protected
 	 */
 	protected function IsOrder($params)
 	{
 		$params['type'] = isset($params['field']) ? 'field' : 'direction';
 		$value = $this->OrderInfo($params);
 
 		if ( isset($params['field']) ) {
 			return $params['field'] == $value;
 		}
 		elseif ( isset($params['direction']) ) {
 			return $params['direction'] == $value;
 		}
 
 		return false;
 	}
 
 	/**
 	 * Returns list per-page
 	 *
 	 * @param Array $params
 	 * @return int
 	 */
 	function PerPage($params)
 	{
 		$object =& $this->GetList($params);
 
 		return $object->GetPerPage();
 	}
 
 	/**
 	 * Checks if list perpage matches value specified
 	 *
 	 * @param Array $params
 	 * @return bool
 	 */
 	function PerPageEquals($params)
 	{
 		$object =& $this->GetList($params);
 
 		return $object->GetPerPage() == $params['value'];
 	}
 
 	function SaveEvent($params)
 	{
 		// SaveEvent is set during OnItemBuild, but we may need it before any other tag calls OnItemBuild
 		$object = $this->getObject($params);
 		return $this->Application->GetVar($this->getPrefixSpecial().'_SaveEvent');
 	}
 
 	function NextId($params)
 	{
 		$object = $this->getObject($params);
 
 		$wid = $this->Application->GetTopmostWid($this->Prefix);
 		$session_name = rtrim($this->getPrefixSpecial().'_selected_ids_'.$wid, '_');
 		$ids = explode(',', $this->Application->RecallVar($session_name));
 
 		$cur_id = $object->GetID();
 
 		$i = array_search($cur_id, $ids);
 		if ($i !== false) {
 			return $i < count($ids) - 1 ? $ids[$i + 1] : '';
 		}
 		return '';
 	}
 
 	function PrevId($params)
 	{
 		$object = $this->getObject($params);
 
 		$wid = $this->Application->GetTopmostWid($this->Prefix);
 		$session_name = rtrim($this->getPrefixSpecial().'_selected_ids_'.$wid, '_');
 		$ids = explode(',', $this->Application->RecallVar($session_name));
 
 		$cur_id = $object->GetID();
 
 		$i = array_search($cur_id, $ids);
 		if ($i !== false) {
 			return $i > 0 ? $ids[$i - 1] : '';
 		}
 		return '';
 	}
 
 	function IsSingle($params)
 	{
 		return ($this->NextId($params) === '' && $this->PrevId($params) === '');
 	}
 
 	function IsLast($params)
 	{
 		return ($this->NextId($params) === '');
 	}
 
 	function IsFirst($params)
 	{
 		return ($this->PrevId($params) === '');
 	}
 
 	/**
 	 * Checks if field value is equal to proposed one
 	 *
 	 * @param Array $params
 	 * @return bool
 	 * @deprecated
 	 */
 	function FieldEquals($params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		return $object->GetDBField( $this->SelectParam($params, 'name,field') ) == $params['value'];
 	}
 
 	/**
 	 * Checks, that grid has icons defined and they should be shown
 	 *
 	 * @param Array $params
 	 * @return bool
 	 */
 	function UseItemIcons($params)
 	{
 		return array_key_exists('Icons', $this->getUnitConfig()->getGridByName($params['grid']));
 	}
 
 	/**
 	 * Returns corresponding to grid layout selector column width
 	 *
 	 * @param Array $params
 	 * @return int
 	 */
 	function GridSelectorColumnWidth($params)
 	{
 		$width = 0;
 		if ($params['selector']) {
 			$width += $params['selector_width'];
 		}
 
 		if ($this->UseItemIcons($params)) {
 			$width += $params['icon_width'];
 		}
 
 		return $width;
 	}
 
 	/**
 	 * Returns grids item selection mode (checkbox, radio, )
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function GridSelector($params)
 	{
 		$grid = $this->getUnitConfig()->getGridByName($params['grid']);
 
 		return array_key_exists('Selector', $grid) ? $grid['Selector'] : $params['default'];
 	}
 
 	function ItemIcon($params)
 	{
 		$config = $this->getUnitConfig();
 		$grid = $config->getGridByName($params['grid']);
 
 		if ( !isset($grid['Icons']) ) {
 			return '';
 		}
 
 		$icons = $grid['Icons'];
 
 		if ( isset($params['name']) ) {
 			$icon_name = $params['name'];
 
 			return isset($icons[$icon_name]) ? $icons[$icon_name] : '';
 		}
 
 		$status_fields = $config->getStatusField(false, Array ());
 
 		if ( !$status_fields ) {
 			return $icons['default'];
 		}
 
+		/** @var kDBList $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBList */
 
 		$icon = '';
 
 		foreach ($status_fields as $status_field) {
 			$icon .= $object->GetDBField($status_field) . '_';
 		}
 
 		$icon = rtrim($icon, '_');
 
 		return isset($icons[$icon]) ? $icons[$icon] : $icons['default'];
 	}
 
 	/**
 	 * Generates bluebar title + initializes prefixes used on page
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function SectionTitle($params)
 	{
 		$config = $this->getUnitConfig();
 		$preset_name = kUtil::replaceModuleSection($params['title_preset']);
 		$title_info = $config->getTitlePresetByName($preset_name);
 
 		if ( $title_info === false ) {
 			$title = str_replace('#preset_name#', $preset_name, $params['title']);
 
 			if ( $this->Application->ConfigValue('UseSmallHeader') && isset($params['group_title']) && $params['group_title'] ) {
 				$title .= ' - ' . $params['group_title'];
 			}
 
 			return $title;
 		}
 
 		$default_title_preset = $config->getTitlePresetByName('default');
 
 		if ( $default_title_preset ) {
 			// use default labels + custom labels specified in preset used
 			$title_info = kUtil::array_merge_recursive($default_title_preset, $title_info);
 		}
 
 		$title = $title_info['format'];
 
 		// 1. get objects in use for title construction
 		$objects = Array ();
 		$object_status = Array ();
 		$status_labels = Array ();
 
 		$prefixes = array_key_exists('prefixes', $title_info) ? $title_info['prefixes'] : false;
 		$all_tag_params = array_key_exists('tag_params', $title_info) ? $title_info['tag_params'] : false;
-		/* @var $prefixes Array */
+		/** @var Array $prefixes */
 
 		if ( $prefixes ) {
 			// extract tag_params passed directly to SectionTitle tag for specific prefix
 			foreach ($params as $tp_name => $tp_value) {
 				if ( preg_match('/(.*)\[(.*)\]/', $tp_name, $regs) ) {
 					$all_tag_params[$regs[1]][$regs[2]] = $tp_value;
 					unset($params[$tp_name]);
 				}
 			}
 
 			$tag_params = Array ();
 
 			foreach ($prefixes as $prefix_special) {
 				$prefix_data = $this->Application->processPrefix($prefix_special);
 				$prefix_data['prefix_special'] = rtrim($prefix_data['prefix_special'], '.');
 
 				if ( $all_tag_params ) {
 					$tag_params = getArrayValue($all_tag_params, $prefix_data['prefix_special']);
 
 					if ( !$tag_params ) {
 						$tag_params = Array ();
 					}
 				}
 
 				$tag_params = array_merge($params, $tag_params);
 				$objects[$prefix_data['prefix_special']] = $this->Application->recallObject($prefix_data['prefix_special'], $prefix_data['prefix'], $tag_params);
 				$object_status[$prefix_data['prefix_special']] = $objects[$prefix_data['prefix_special']]->IsNewItem() ? 'new' : 'edit';
 
 				// a. set object's status field (adding item/editing item) for each object in title
 				if ( getArrayValue($title_info[$object_status[$prefix_data['prefix_special']] . '_status_labels'], $prefix_data['prefix_special']) ) {
 					$status_labels[$prefix_data['prefix_special']] = $title_info[$object_status[$prefix_data['prefix_special']] . '_status_labels'][$prefix_data['prefix_special']];
 					$title = str_replace('#' . $prefix_data['prefix_special'] . '_status#', $status_labels[$prefix_data['prefix_special']], $title);
 				}
 
 				// b. setting object's titlefield value (in titlebar ONLY) to default in case if object beeing created with no titlefield filled in
 				if ( $object_status[$prefix_data['prefix_special']] == 'new' ) {
 					$new_value = $this->getInfo($objects[$prefix_data['prefix_special']], 'titlefield');
 
 					if ( !$new_value && getArrayValue($title_info['new_titlefield'], $prefix_data['prefix_special']) ) {
 						$new_value = $this->Application->Phrase($title_info['new_titlefield'][$prefix_data['prefix_special']]);
 					}
 
 					$title = str_replace('#' . $prefix_data['prefix_special'] . '_titlefield#', $new_value, $title);
 				}
 			}
 		}
 
 		// replace to section title
 		$section = array_key_exists('section', $params) ? $params['section'] : false;
 
 		if ( $section ) {
+			/** @var kSectionsHelper $sections_helper */
 			$sections_helper = $this->Application->recallObject('SectionsHelper');
-			/* @var $sections_helper kSectionsHelper */
 
 			$section_data =& $sections_helper->getSectionData($section);
 			$title = str_replace('#section_label#', '!' . $section_data['label'] . '!', $title);
 		}
 
 		// 2. replace phrases if any found in format string
 		$title = $this->Application->ReplaceLanguageTags($title, false);
 
 		// 3. find and replace any replacement vars
 		preg_match_all('/#(.*_.*)#/Uis', $title, $rets);
 		if ( $rets[1] ) {
 			$replacement_vars = array_keys(array_flip($rets[1]));
 
 			foreach ($replacement_vars as $replacement_var) {
 				$var_info = explode('_', $replacement_var, 2);
 				$object =& $objects[$var_info[0]];
 				$new_value = $this->getInfo($object, $var_info[1]);
 				$title = str_replace('#' . $replacement_var . '#', $new_value, $title);
 			}
 		}
 
 		// replace trailing spaces inside title preset + '' occurrences into single space
 		$title = preg_replace('/[ ]*\'\'[ ]*/', ' ', $title);
 
 		if ( $this->Application->ConfigValue('UseSmallHeader') && isset($params['group_title']) && $params['group_title'] ) {
 			$title .= ' - ' . $params['group_title'];
 		}
 
 		$first_chars = $this->SelectParam($params, 'first_chars,cut_first');
 
 		if ( $first_chars && !preg_match('/<a href="(.*)".*>(.*)<\/a>/', $title) ) {
 			// don't cut titles, that contain phrase translation links
 			$stripped_title = strip_tags($title, $this->SelectParam($params, 'allowed_tags'));
 
 			if ( mb_strlen($stripped_title) > $first_chars ) {
 				$title = mb_substr($stripped_title, 0, $first_chars) . ' ...';
 			}
 		}
 
 		return $title;
 	}
 
 	/**
 	 * Returns information about list
 	 *
 	 * @param kDBList $object
 	 * @param string $info_type
 	 * @return string
 	 * @access protected
 	 */
 	protected function getInfo(&$object, $info_type)
 	{
 		switch ( $info_type ) {
 			case 'titlefield':
 				$field = $object->getUnitConfig()->getTitleField();
 
 				return $field !== false ? $object->GetField($field) : 'TitleField Missing';
 				break;
 
 			case 'recordcount':
 				if ( $object->GetRecordsCount(false) != $object->GetRecordsCount() ) {
 					$of_phrase = $this->Application->Phrase('lc_of');
 
 					return $object->GetRecordsCount() . ' ' . $of_phrase . ' ' . $object->GetRecordsCount(false);
 				}
 
 				return $object->GetRecordsCount();
 				break;
 		}
 
 		return $object->GetField($info_type);
 	}
 
 	function GridInfo($params)
 	{
+		/** @var kDBList $object */
 		$object =& $this->GetList($params);
-		/* @var $object kDBList */
 
 		switch ( $params['type'] ) {
 			case 'filtered':
 				return $object->GetRecordsCount();
 
 			case 'total':
 				return $object->GetRecordsCount(false);
 
 			case 'selected':
 				return $object->GetSelectedCount();
 
 			case 'from':
 				return $object->GetRecordsCount() ? $object->GetOffset() + 1 : 0; //0-based
 
 			case 'to':
 				$record_count = $object->GetRecordsCount();
 				return $object->GetPerPage(true) != -1 ? min($object->GetOffset() + $object->GetPerPage(), $record_count) : $record_count;
 
 			case 'total_pages':
 				return $object->GetTotalPages();
 
 			case 'needs_pagination':
 				return ($object->GetPerPage(true) != -1) && (($object->GetRecordsCount() > $object->GetPerPage()) || ($object->GetPage() > 1));
 		}
 
 		return false;
 	}
 
 	/**
 	 * Parses block depending on its element type.
 	 * For radio and select elements values are taken from 'value_list_field' in key1=value1,key2=value2
 	 * format. key=value can be substituted by <SQL>SELECT f1 AS OptionName, f2 AS OptionValue... FROM <PREFIX>TableName </SQL>
 	 * where prefix is TABLE_PREFIX
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function ConfigFormElement($params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		$field = $params['field'];
 
+		/** @var InpCustomFieldsHelper $helper */
 		$helper = $this->Application->recallObject('InpCustomFieldsHelper');
-		/* @var $helper InpCustomFieldsHelper */
 
 		$element_type = $object->GetDBField($params['element_type_field']);
 
 		if ($element_type == 'label') {
 			$element_type = 'text';
 		}
 
 		$formatter_class = $object->GetFieldOption($field, 'formatter');
 
 		switch ($element_type) {
 			case 'select':
 			case 'multiselect':
 			case 'radio':
 				if ($object->GetDBField('DirectOptions')) {
 					// used for custom fields
 					$options = $object->GetDBField('DirectOptions');
 				}
 				else {
 					// used for configuration
 					$options = $helper->GetValuesHash( $object->GetDBField($params['value_list_field']) );
 				}
 
 				$object->SetFieldOption($field, 'formatter', 'kOptionsFormatter');
 				$object->SetFieldOption($field, 'options', $options);
 				break;
 
 			case 'text':
 			case 'textarea':
 			case 'upload':
 				$params['field_params'] = $helper->ParseConfigSQL($object->GetDBField($params['value_list_field']));
 				break;
 
 			case 'password':
 			case 'checkbox':
 			default:
 				break;
 		}
 
 		if (!$element_type) {
 			throw new Exception('Element type missing for "<strong>' . $object->GetDBField('VariableName') . '</strong>" configuration variable');
 		}
 
 		$params['name'] = $params['blocks_prefix'] . $element_type;
 
 		// use $pass_params to pass 'SourcePrefix' parameter from PrintList to CustomInputName tag
 		$ret = $this->Application->ParseBlock($params, 1);
 
 		$object->SetFieldOption($field, 'formatter', $formatter_class);
 
 		return $ret;
 	}
 
 	/**
 	 * Get's requested custom field value
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access public
 	 */
 	function CustomField($params)
 	{
 		$params['name'] = 'cust_'.$this->SelectParam($params, 'name,field');
 		return $this->Field($params);
 	}
 
 	function CustomFieldLabel($params)
 	{
 		$object = $this->getObject($params);
 
 		$field = $this->SelectParam($params, 'name,field');
 
 		$sql = 'SELECT FieldLabel
 				FROM ' . $this->Application->getUnitConfig('cf')->getTableName() . '
 				WHERE FieldName = ' . $this->Conn->qstr($field);
 
 		return $this->Application->Phrase($this->Conn->GetOne($sql));
 	}
 
 	/**
 	 * transposes 1-dimensional array elements for vertical alignment according to given columns and per_page parameters
 	 *
 	 * @param array $arr
 	 * @param int $columns
 	 * @param int $per_page
 	 * @return array
 	 */
 	function LinearToVertical(&$arr, $columns, $per_page)
 	{
 		$rows = $columns;
 		// in case if after applying per_page limit record count less then
 		// can fill requrested column count, then fill as much as we can
 		$cols = min(ceil($per_page / $columns), ceil(count($arr) / $columns));
 		$imatrix = array();
 		for ($row = 0; $row < $rows; $row++) {
 			for ($col = 0; $col < $cols; $col++) {
 				$source_index = $row * $cols + $col;
 				if (!isset($arr[$source_index])) {
 					// in case if source array element count is less then element count in one row
 					continue;
 				}
 				$imatrix[$col * $rows + $row] = $arr[$source_index];
 			}
 		}
 
 		ksort($imatrix);
 		return array_values($imatrix);
 	}
 
 	/**
 	 * If data was modified & is in TempTables mode, then parse block with name passed;
 	 * remove modification mark if not in TempTables mode
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function SaveWarning($params)
 	{
 		$main_prefix = array_key_exists('main_prefix', $params) ? $params['main_prefix'] : false;
 
 		if ( $main_prefix ) {
 			$top_prefix = $main_prefix;
 		}
 		else {
 			$top_prefix = $this->Application->GetTopmostPrefix($this->Prefix);
 		}
 
 		$temp_tables = substr($this->Application->GetVar($top_prefix . '_mode'), 0, 1) == 't';
 		$modified = $this->Application->RecallVar($top_prefix . '_modified');
 
 		if ( $temp_tables && $modified ) {
 			$block_params = $this->prepareTagParams($params);
 			$block_params['name'] = $this->SelectParam($params, 'render_as,name');
 			$block_params['edit_mode'] = $temp_tables ? 1 : 0;
 			return $this->Application->ParseBlock($block_params);
 		}
 
 		$this->Application->RemoveVar($top_prefix . '_modified');
 		return '';
 	}
 
 	/**
 	 * Returns list record count queries (on all pages)
 	 *
 	 * @param Array $params
 	 * @return int
 	 */
 	function TotalRecords($params)
 	{
 		$list =& $this->GetList($params);
 
 		return $list->GetRecordsCount();
 	}
 
 	/**
 	 * Returns selected records count.
 	 *
 	 * @param array $params Tag params.
 	 *
 	 * @return string
 	 */
 	protected function SelectedRecords(array $params)
 	{
 		$list =& $this->GetList($params);
 
 		return $list->GetSelectedCount();
 	}
 
 	/**
 	 * Range filter field name
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function SearchInputName($params)
 	{
 		$field = $this->SelectParam($params, 'field,name');
 
 		$ret = 'custom_filters['.$this->getPrefixSpecial().']['.$params['grid'].']['.$field.']['.$params['filter_type'].']';
 
 		if (isset($params['type'])) {
 			$ret .= '['.$params['type'].']';
 		}
 
 		if (array_key_exists('as_preg', $params) && $params['as_preg']) {
 			$ret = preg_quote($ret, '/');
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Return range filter field value
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function SearchField($params) // RangeValue
 	{
 		$field = $this->SelectParam($params, 'field,name');
 
 		$view_name = $this->Application->RecallVar($this->getPrefixSpecial() . '_current_view');
 		$custom_filter = $this->Application->RecallPersistentVar($this->getPrefixSpecial() . '_custom_filter.' . $view_name /*, ALLOW_DEFAULT_SETTINGS*/);
 		$custom_filter = $custom_filter ? unserialize($custom_filter) : Array ();
 
 		if ( isset($custom_filter[$params['grid']][$field]) ) {
 			$ret = $custom_filter[$params['grid']][$field][$params['filter_type']]['submit_value'];
 			if ( isset($params['type']) ) {
 				$ret = $ret[$params['type']];
 			}
 
 			if ( array_key_exists('formatted', $params) && $params['formatted'] ) {
 				$object =& $this->GetList($params);
 				$formatter_class = $object->GetFieldOption($field, 'formatter');
 
 				if ( $formatter_class ) {
+					/** @var kFormatter $formatter */
 					$formatter = $this->Application->recallObject($formatter_class);
-					/* @var $formatter kFormatter */
 
 					$ret = $formatter->Format($ret, $field, $object);
 				}
 			}
 
 			if ( !array_key_exists('no_special', $params) || !$params['no_special'] ) {
 				$ret = kUtil::escape($ret);
 			}
 
 			return $ret;
 		}
 
 		return '';
 	}
 
 	/**
 	 * Tells, that at least one of search filters is used by now
 	 *
 	 * @param Array $params
 	 * @return bool
 	 */
 	function SearchActive($params)
 	{
 		if ($this->Application->RecallVar($this->getPrefixSpecial() . '_search_keyword')) {
 			// simple search filter is used
 			return true;
 		}
 
 		$view_name = $this->Application->RecallVar($this->getPrefixSpecial().'_current_view');
 		$custom_filter = $this->Application->RecallPersistentVar($this->getPrefixSpecial().'_custom_filter.'.$view_name/*, ALLOW_DEFAULT_SETTINGS*/);
 		$custom_filter = $custom_filter ? unserialize($custom_filter) : Array();
 
 		return array_key_exists($params['grid'], $custom_filter);
 	}
 
 	function SearchFormat($params)
 	{
 		$object =& $this->GetList($params);
 
         return $this->Format($params, $object);
 	}
 
 	/**
 	 * Returns error of range field
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function SearchError($params)
 	{
 		$field = $this->SelectParam($params, 'field,name');
 
 		$error_var_name = $this->getPrefixSpecial() . '_' . $field . '_error';
 		$pseudo = $this->Application->RecallVar($error_var_name);
 		if ( $pseudo ) {
 			$this->Application->RemoveVar($error_var_name);
 		}
 
+		/** @var kDBItem $object */
 		$object = $this->Application->recallObject($this->Prefix . '.' . $this->Special . '-item', null, Array ('skip_autoload' => true));
-		/* @var $object kDBItem */
 
 		$object->SetError($field, $pseudo);
 		return $object->GetErrorMsg($field, false);
 	}
 
 	/**
 	 * Returns object used in tag processor
 	 *
 	 * @param Array $params
 	 * @access public
 	 * @return kDBItem|kDBList
 	 */
 	function getObject($params = Array())
 	{
+		/** @var kDBItem $object */
 		$object = $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix, $params);
-		/* @var $object kDBItem */
 
 		if ( isset($params['requery']) && $params['requery'] ) {
 			$this->Application->HandleEvent(new kEvent($this->getPrefixSpecial() . ':LoadItem', $params));
 		}
 
 		return $object;
 	}
 
 	/**
 	 * Checks if object propery value matches value passed
 	 *
 	 * @param Array $params
 	 * @return bool
 	 */
 	function PropertyEquals($params)
 	{
 		$object = $this->getObject($params);
 		$property_name = $this->SelectParam($params, 'name,var,property');
 		return $object->$property_name == $params['value'];
 	}
 
 	function DisplayOriginal($params)
 	{
 		return false;
 	}
 
 	/*function MultipleEditing($params)
 	{
 		$wid = $this->Application->GetTopmostWid($this->Prefix);
 		$session_name = rtrim($this->getPrefixSpecial().'_selected_ids_'.$wid, '_');
 		$selected_ids = explode(',', $this->Application->RecallVar($session_name));
 
 		$ret = '';
 		if ($selected_ids) {
 			$selected_ids = explode(',', $selected_ids);
 			$object = $this->getObject( kUtil::array_merge_recursive($params, Array('skip_autoload' => true)) );
 			$params['name'] = $params['render_as'];
 			foreach ($selected_ids as $id) {
 				$object->Load($id);
 				$ret .= $this->Application->ParseBlock($params);
 			}
 		}
 
 		return $ret;
 	}*/
 
 	/**
 	 * Returns import/export process percent
 	 *
 	 * @param Array $params
 	 * @return int
 	 * @deprecated Please convert to event-model, not tag based
 	 */
 	function ExportStatus($params)
 	{
+		/** @var kCatDBItemExportHelper $export_object */
 		$export_object = $this->Application->recallObject('CatItemExportHelper');
-		/* @var $export_object kCatDBItemExportHelper */
 
 		$event = new kEvent($this->getPrefixSpecial().':OnDummy');
 
 		$action_method = 'perform'.ucfirst($this->Special);
 		$field_values = $export_object->$action_method($event);
 
 		// finish code is done from JS now
 		if ($field_values['start_from'] >= $field_values['total_records'])
 		{
 			if ($this->Special == 'import') {
 				// this is used?
 				$this->Application->StoreVar('PermCache_UpdateRequired', 1);
 				$this->Application->Redirect('categories/cache_updater', Array('m_opener' => 'r', 'pass' => 'm', 'continue' => 1));
 			}
 			elseif ($this->Special == 'export') {
 				// used for orders export in In-Commerce
 				$finish_t = $this->Application->RecallVar('export_finish_t');
 				$this->Application->Redirect($finish_t, Array('pass' => 'all'));
 				$this->Application->RemoveVar('export_finish_t');
 			}
 		}
 
 		$export_options = $export_object->loadOptions($event);
 		return $export_options['start_from']  * 100 / $export_options['total_records'];
 	}
 
 	/**
 	 * Returns path where exported category items should be saved
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function ExportPath($params)
 	{
 		$export_options = unserialize($this->Application->RecallVar($this->getPrefixSpecial() . '_options'));
 		$extension = $export_options['ExportFormat'] == 1 ? 'csv' : 'xml';
 		$filename = preg_replace('/(.*)\.' . $extension . '$/', '\1', $export_options['ExportFilename']) . '.' . $extension;
 
 		$path = EXPORT_PATH . '/';
 
 		if ( array_key_exists('as_url', $params) && $params['as_url'] ) {
 			$path = str_replace(FULL_PATH . '/', $this->Application->BaseURL(), $path);
 		}
 
 		return $path . $filename;
 	}
 
 	function FieldTotal($params)
 	{
 		$list =& $this->GetList($params);
 		$field = $this->SelectParam($params, 'field,name');
 		$total_function = array_key_exists('function', $params) ? $params['function'] : $list->getTotalFunction($field);
 
 		if (array_key_exists('function_only', $params) && $params['function_only']) {
 			return $total_function;
 		}
 
 		if (array_key_exists('currency', $params) && $params['currency']) {
 			$iso = $this->GetISO($params['currency']);
 			$original = $list->getTotal($field, $total_function);
 			$value = $this->ConvertCurrency($original, $iso);
 			$list->setTotal($field, $total_function, $value);
 		}
 
 		$value = $list->GetFormattedTotal($field, $total_function);
 
 		if (array_key_exists('currency', $params) && $params['currency']) {
 			$value = $this->AddCurrencySymbol($value, $iso);
 		}
 
 		return $value;
 	}
 
 	function FCKEditor($params)
 	{
 		$editor_name = array_key_exists('name', $params) ? $params['name'] : $this->InputName($params);
 
+		/** @var fckFCKHelper $fck_helper */
 		$fck_helper = $this->Application->recallObject('FCKHelper');
-		/* @var $fck_helper fckFCKHelper */
 
 		if ( isset($params['mode']) && $params['mode'] == 'inline' ) {
 			return $fck_helper->CKEditorInlineTag($editor_name, $params);
 		}
 
 		return $fck_helper->CKEditorTag($editor_name, $this->CKEditorValue($params), $params);
 	}
 
 	/**
 	 * Returns value, used by FCKEditor tag
 	 *
 	 * @param array $params
 	 *
 	 * @return string
 	 */
 	protected function CKEditorValue($params)
 	{
 		$params['no_special'] = 1;
 		$params['format'] = array_key_exists('format', $params) ? $params['format'] . ';fck_ready' : 'fck_ready';
 
 		return $this->Field($params);
 	}
 
 	function IsNewItem($params)
 	{
 		$object = $this->getObject($params);
 		return $object->IsNewItem();
 	}
 
 	/**
 	 * Creates link to an item including only it's id
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function ItemLink($params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		if ( !isset($params['pass']) ) {
 			$params['pass'] = 'm';
 		}
 
 		$params[ $object->getPrefixSpecial() . '_id' ] = $object->GetID();
 
 		return $this->Application->ProcessParsedTag('m', 'T', $params);
 	}
 
 	/**
 	 * Creates a button for editing item in Admin Console
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 * @throws InvalidArgumentException
 	 */
 	protected function AdminEditButton($params)
 	{
 		if ( EDITING_MODE != EDITING_MODE_CONTENT ) {
 			return '';
 		}
 
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		$item_prefix = isset($params['item_prefix']) ? $params['item_prefix'] : $this->Prefix;
 
 		if ( isset($params['template']) ) {
 			$template = $params['template'];
 		}
 		else {
 			$item_config = $this->Application->getUnitConfig($item_prefix);
 
 			$admin_template_prefix = $item_config->getAdminTemplatePrefix();
 			$template = $item_config->getAdminTemplatePath() . '/' . $admin_template_prefix . 'edit';
 
 			if ( !$admin_template_prefix ) {
 				throw new InvalidArgumentException('Automatic admin editing template detection failed because of missing "AdminTemplatePrefix" unit config option in "' . $this->Prefix . '" unit config');
 			}
 		}
 
 		$form_name = 'kf_' . str_replace('-', '_', $item_prefix) . '_' . $object->GetID();
 		$form_name .= '_' . kUtil::crc32(json_encode($params));
 		$button_icon = isset($params['button_icon']) ? $params['button_icon'] : 'content_mode.png';
 		$button_class = isset($params['button_class']) ? $params['button_class'] : 'admin-edit-btn';
 		$button_title = isset($params['button_title']) ? $params['button_title'] : 'la_btn_AdminEditItem';
 
 		if ( substr($button_title, 0, 1) == '+' ) {
 			$button_title = substr($button_title, 1);
 		}
 		else {
 			$button_title = $this->Application->Phrase($button_title, false, true);
 		}
 
 		$icon_url = $this->Application->BaseURL() . 'core/admin_templates/img/top_frame/icons/' . $button_icon;
 		$button_onclick = '$form_name = ' . json_encode($form_name) . '; std_edit_item(' . json_encode($item_prefix) . ', ' . json_encode($template) . '); return false;';
 
 		$button_code = '<button
 			style="background-image: url(' . $icon_url . ');"
 			onclick="' . kUtil::escape($button_onclick, kUtil::ESCAPE_HTML) . '"
 			class="cms-btn-new ' . $button_class . '">' .
 			kUtil::escape($button_title, kUtil::ESCAPE_HTML) . '
 		</button>';
 
 		if ( !isset($params['pass']) ) {
 			$params['pass'] = 'm,' . $item_prefix;
 		}
 
 		$params['m_opener'] = 'd';
 		$params[$item_prefix . '_id'] = $object->GetID();
 
 		if ( !isset($params['temp_mode']) || (isset($params['temp_mode']) && $params['temp_mode']) ) {
 			$params[$item_prefix . '_mode'] = 't';
 			$params[$item_prefix . '_event'] = 'OnEdit';
 		}
 
 		$params['front'] = 1; // to make opener stack work properly
 		$params['__NO_REWRITE__'] = 1; // since admin link
 
 		unset($params['button_icon'], $params['button_class'], $params['button_title'], $params['template'], $params['item_prefix'], $params['temp_mode']);
 
 		// link from Front-End to Admin, don't remove "index.php"
 		$form_name_escaped = kUtil::escape($form_name, kUtil::ESCAPE_HTML);
 		$edit_url = kUtil::escape($this->Application->HREF($template, ADMIN_DIRECTORY, $params, 'index.php'), kUtil::ESCAPE_HTML);
 		$edit_form = '<form method="POST" style="display: inline; margin: 0px" name="' . $form_name_escaped . '" id="' . $form_name_escaped . '" action="' . $edit_url . '"></form>';
 
 		if ( isset($params['forms_later']) && $params['forms_later'] ) {
 			$all_forms = $this->Application->GetVar('all_forms');
 			$this->Application->SetVar('all_forms', $all_forms . $edit_form);
 		}
 		else {
 			$button_code .= $edit_form;
 		}
 
 		return $button_code;
 	}
 
 	/**
 	 * Calls OnNew event from template, when no other event submitted
 	 *
 	 * @param Array $params
 	 */
 	function PresetFormFields($params)
 	{
 		$prefix = $this->getPrefixSpecial();
 		if ( !$this->Application->GetVar($prefix . '_event') ) {
 			$this->Application->HandleEvent(new kEvent($prefix . ':OnNew'));
 		}
 	}
 
 	function PrintSerializedFields($params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		$field = $this->SelectParam($params, 'field');
 		$data = unserialize($object->GetDBField($field));
 		$o = '';
 		$std_params['name'] = $params['render_as'];
 		$std_params['field'] = $params['field'];
 		$std_params['pass_params'] = true;
 
 		foreach ($data as $key => $row) {
 			$block_params = array_merge($std_params, $row, array('key'=>$key));
 			$o .= $this->Application->ParseBlock($block_params);
 		}
 
 		return $o;
 	}
 	/**
 	 * Checks if current prefix is main item
 	 *
 	 * @param Array $params
 	 * @return bool
 	 */
 	function IsTopmostPrefix($params)
 	{
 		return $this->Prefix == $this->Application->GetTopmostPrefix($this->Prefix);
 	}
 
 	function PermSection($params)
 	{
 		$section = $this->SelectParam($params, 'section,name');
 
 		return $this->getUnitConfig()->getPermSectionByName($section, '');
 	}
 
 	function PerPageSelected($params)
 	{
 		$list =& $this->GetList($params);
 
 		return $list->GetPerPage(true) == $params['per_page'] ? $params['selected'] : '';
 	}
 
 	/**
 	 * Returns prefix + generated sepcial + any word
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function VarName($params)
 	{
 		$list =& $this->GetList($params);
 
 		return $list->getPrefixSpecial() . '_' . $params['type'];
 	}
 
 	/**
 	 * Returns edit tabs by specified preset name or false in case of error
 	 *
 	 * @param string $preset_name
 	 * @return mixed
 	 */
 	function getEditTabs($preset_name)
 	{
 		$presets = $this->getUnitConfig()->getEditTabPresets();
 
 		if ( !$presets || !isset($presets[$preset_name]) || count($presets[$preset_name]) == 0 ) {
 			return false;
 		}
 
 		return count($presets[$preset_name]) > 1 ? $presets[$preset_name] : false;
 	}
 
 	/**
 	 * Detects if specified preset has tabs in it
 	 *
 	 * @param Array $params
 	 * @return bool
 	 */
 	function HasEditTabs($params)
 	{
 		return $this->getEditTabs($params['preset_name']) ? true : false;
 	}
 
 	/**
 	 * Sorts edit tabs based on their priority
 	 *
 	 * @param Array $tab_a
 	 * @param Array $tab_b
 	 * @return int
 	 */
 	function sortEditTabs($tab_a, $tab_b)
 	{
 		if ($tab_a['priority'] == $tab_b['priority']) {
 			return 0;
 		}
 
 		return $tab_a['priority'] < $tab_b['priority'] ? -1 : 1;
 	}
 
 	/**
 	 * Prints edit tabs based on preset name specified
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function PrintEditTabs($params)
 	{
 		$edit_tabs = $this->getEditTabs($params['preset_name']);
 		if ( !$edit_tabs ) {
 			return '';
 		}
 		usort($edit_tabs, Array (&$this, 'sortEditTabs'));
 
 		$ret = '';
 		$block_params = $this->prepareTagParams($params);
 		$block_params['name'] = $params['render_as'];
 
 		foreach ($edit_tabs as $tab_info) {
 			$block_params['title'] = $tab_info['title'];
 			$block_params['template'] = $tab_info['t'];
 			$ret .= $this->Application->ParseBlock($block_params);
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Performs image resize to required dimensions and returns resulting url (cached resized image)
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function ImageSrc($params)
 	{
 		$max_width = isset($params['MaxWidth']) ? $params['MaxWidth'] : false;
 		$max_height = isset($params['MaxHeight']) ? $params['MaxHeight'] : false;
 
 		$logo_filename = isset($params['LogoFilename']) ? $params['LogoFilename'] : false;
 		$logo_h_margin = isset($params['LogoHMargin']) ? $params['LogoHMargin'] : false;
 		$logo_v_margin = isset($params['LogoVMargin']) ? $params['LogoVMargin'] : false;
 		$object = $this->getObject($params);
 
 		$field = $this->SelectParam($params, 'name,field');
 		return $object->GetField($field, 'resize:'.$max_width.'x'.$max_height.';wm:'.$logo_filename.'|'.$logo_h_margin.'|'.$logo_v_margin);
 	}
 
 	/**
 	 * Allows to retrieve given setting from unit config
 	 *
 	 * @param Array $params
 	 * @return mixed
 	 */
 	function UnitOption($params)
 	{
 		return $this->getUnitConfig()->getSetting($params['name']);
 	}
 
 	/**
 	 * Returns list of allowed toolbar buttons or false, when all is allowed
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function VisibleToolbarButtons($params)
 	{
 		$preset_name = kUtil::replaceModuleSection($params['title_preset']);
 		$preset_info = $this->getUnitConfig()->getTitlePresetByName($preset_name);
 
 		if ( !$preset_info ) {
 			trigger_error('Title preset not specified or missing (in tag "<strong>' . $this->getPrefixSpecial() . ':' . __METHOD__ . '</strong>")', E_USER_NOTICE);
 
 			return false;
 		}
 
 		if ( !array_key_exists('toolbar_buttons', $preset_info) || !is_array($preset_info['toolbar_buttons']) ) {
 			return false;
 		}
 
 		// always add search buttons
 		array_push($preset_info['toolbar_buttons'], 'search', 'search_reset_alt');
 		$toolbar_buttons = array_values($preset_info['toolbar_buttons']); // reset index
 
 		return $toolbar_buttons ? trim(json_encode($toolbar_buttons), '[]') : 'false';
 	}
 
 	/**
 	 * Checks, that "To" part of at least one of range filters is used
 	 *
 	 * @param Array $params
 	 * @return bool
 	 */
 	function RangeFiltersUsed($params)
 	{
+		/** @var kSearchHelper $search_helper */
 		$search_helper = $this->Application->recallObject('SearchHelper');
-		/* @var $search_helper kSearchHelper */
 
 		return $search_helper->rangeFiltersUsed($this->getPrefixSpecial(), $params['grid']);
 	}
 
 	/**
 	 * This is abstract tag, used to modify unit config data based on template, where it's used.
 	 * Tag is called from "combined_header" block in admin only.
 	 *
 	 * @param Array $params
 	 */
 	function ModifyUnitConfig($params)
 	{
 
 	}
 
 	/**
 	 * Checks, that field is visible on edit form
 	 *
 	 * @param Array $params
 	 * @return bool
 	 */
 	function FieldVisible($params)
 	{
 		$check_field = $params['field'];
 		$field_options = $this->_getFieldDefinition($check_field);
 
 		if ( !$field_options ) {
 			$params['field'] = 'Password';
 
 			return $check_field == 'VerifyPassword' ? $this->FieldVisible($params) : true;
 		}
 
 		$show_mode = array_key_exists('show_mode', $field_options) ? $field_options['show_mode'] : true;
 
 		if ( $show_mode === smDEBUG ) {
 			return defined('DEBUG_MODE') && DEBUG_MODE;
 		}
 
 		return $show_mode;
 	}
 
 	/**
 	 * Checks, that there area visible fields in given section on edit form
 	 *
 	 * @param Array $params
 	 * @return bool
 	 */
 	function FieldsVisible($params)
 	{
 		if ( !$params['fields'] ) {
 			return true;
 		}
 
 		$check_fields = explode(',', $params['fields']);
 
 		foreach ($check_fields as $check_field) {
 			// when at least one field in subsection is visible, then subsection is visible too
 			$field_options = $this->_getFieldDefinition($check_field);
 
 			if ( $field_options ) {
 				$show_mode = array_key_exists('show_mode', $field_options) ? $field_options['show_mode'] : true;
 			}
 			else {
 				$show_mode = true;
 			}
 
 			if ( ($show_mode === true) || (($show_mode === smDEBUG) && (defined('DEBUG_MODE') && DEBUG_MODE)) ) {
 				// field is visible
 				return true;
 			}
 		}
 
 		return false;
 	}
 
 	/**
 	 * Returns field definition
 	 *
 	 * @param string $field_name
 	 * @return Array
 	 * @access protected
 	 */
 	protected function _getFieldDefinition($field_name)
 	{
 		$config = $this->getUnitConfig();
 		$ret = $config->getFieldByName($field_name);
 
 		if ( !$ret ) {
 			$ret = $config->getVirtualFieldByName($field_name);
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Checks, that requested option is checked inside field value.
 	 *
 	 * @param array $params Tag params.
 	 *
 	 * @return boolean
 	 */
 	protected function Selected(array $params)
 	{
 		/** @var kDBItem $object */
 		$object = $this->getObject($params);
 
 		$field = $this->SelectParam($params, 'name,field');
 		$value = $object->GetDBField($field);
 
 		if ( strpos($value, '|') !== false ) {
 			$selected_values = explode('|', substr($value, 1, -1));
 		}
 		else {
 			$selected_values = array((string)$value);
 		}
 
 		return in_array((string)$params['value'], $selected_values, true);
 	}
 
 	/**
 	 * Displays option name by it's value
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function OptionValue($params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		$value = $params['value'];
 		$field = $this->SelectParam($params, 'name,field');
 
 		$field_options = $object->GetFieldOptions($field);
 
 		if ( isset($field_options['options'][$value]) ) {
 			$value = $field_options['options'][$value];
 			$use_phrases = isset($field_options['use_phrases']) ? $field_options['use_phrases'] : false;
 
 			return $use_phrases ? $this->Application->Phrase($value) : $value;
 		}
 
 		return '';
 	}
 
 	/**
 	 * Returns/sets form name for current object
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function FormName($params)
 	{
 		$form_name = $this->SelectParam($params, 'name,form,form_name');
 
 		if ( $form_name ) {
 			$prefix = $this->getPrefixSpecial();
 
 			if ( $this->Application->hasObject( $this->getPrefixSpecial() ) ) {
+				/** @var kDBItem $object */
 				$object = $this->getObject($params);
-				/* @var $object kDBItem */
 
 				if ( $object->getFormName() != $form_name ) {
 					trigger_error('Setting form to "<strong>' . $form_name . '</strong>" failed, since object "<strong>' . $this->getPrefixSpecial() . '</strong>" is created before FormName tag (e.g. in event or another tag).', E_USER_WARNING);
 				}
 			}
 			else {
 				$forms = $this->Application->GetVar('forms', Array ());
 				$forms[ $this->getPrefixSpecial() ] = $form_name;
 				$this->Application->SetVar('forms', $forms);
 			}
 
 			return '';
 		}
 
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		return $object->getFormName();
 	}
 
 	/**
 	 * Just reloads the object using given parameters
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function ReloadItem($params)
 	{
 		$params['requery'] = 1;
 
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		return '';
 	}
 }
Index: branches/5.3.x/core/kernel/db/cat_tag_processor.php
===================================================================
--- branches/5.3.x/core/kernel/db/cat_tag_processor.php	(revision 16518)
+++ branches/5.3.x/core/kernel/db/cat_tag_processor.php	(revision 16519)
@@ -1,968 +1,969 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class kCatDBTagProcessor extends kDBTagProcessor {
 
 		/**
 		 * Permission Helper
 		 *
 		 * @var kPermissionsHelper
 		 */
 		var $PermHelper = null;
 
 		public function __construct()
 		{
 			parent::__construct();
 
 			$this->PermHelper = $this->Application->recallObject('PermissionsHelper');
 		}
 
 		function ItemIcon($params)
 		{
 			$config = $this->getUnitConfig();
 			$grid = $config->getGridByName($params['grid']);
 
 			if ( !array_key_exists('Icons', $grid) ) {
 				return '';
 			}
 
 			$icons = $grid['Icons'];
 
 			if ( array_key_exists('name', $params) ) {
 				$icon_name = $params['name'];
 
 				return array_key_exists($icon_name, $icons) ? $icons[$icon_name] : '';
 			}
 
 			$status_field = $config->getStatusField(true);
 
 			if ( !$status_field ) {
 				return $icons['default'];
 			}
 
+			/** @var kDBList $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBList */
 
 			$value = $object->GetDBField($status_field); // sets base status icon
 
 			if ( $value == STATUS_ACTIVE ) {
 				/*if ( $object->HasField('IsPop') && $object->GetDBField('IsPop') ) {
 					$value = 'POP';
 				}
 
 				if ( $object->HasField('IsHot') && $object->GetDBField('IsHot') ) {
 					$value = 'HOT';
 				}*/
 
 				if ( $object->HasField('IsNew') && $object->GetDBField('IsNew') ) {
 					$value = 'NEW';
 				}
 
 				/*if ( $object->HasField('EditorsPick') && $object->GetDBField('EditorsPick') ) {
 					$value = 'PICK';
 				}*/
 			}
 
 			return array_key_exists($value, $icons) ? $icons[$value] : $icons['default'];
 		}
 
 		/**
 		 * Allows to create valid mod-rewrite compatible link to module item
 		 *
 		 * @param Array $params
 		 * @param string $id_prefix
 		 * @return string
 		 */
 		function ItemLink($params, $id_prefix = null)
 		{
 			if ($this->Application->isAdmin) {
 				// link from Admin to Front-end
 				$params['prefix'] = '_FRONT_END_';
 
 				if ( $this->Application->ConfigValue('UseModRewrite') ) {
 					$params['__MOD_REWRITE__'] = 1;
 				}
 				else {
 					$params['index_file'] = 'index.php';
 				}
 			}
 
 			if ( !isset($params['pass']) ) {
 				$params['pass'] = 'm,'.$this->Prefix;
 			}
 
 			// set by PrintList2 tag
 			$item_id = $this->Application->GetVar($this->getPrefixSpecial() . '_id');
 
 			if ( !$item_id && ($this->Special != 'next' && $this->Special != 'previous') ) {
 				// set from page url
 				$item_id = $this->Application->GetVar($this->Prefix . '_id');
 			}
 
+			/** @var kDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBItem */
 
 			$params['m_cat_page'] = 1;
 			$params['m_cat_id'] = $object->GetDBField('CategoryId');
 			$params['pass_category'] = 1;
 			$params[$this->Prefix . '_id'] = $item_id ? $item_id : $object->GetID();
 
 			return $this->Application->ProcessParsedTag('m', 't', $params);
 		}
 
 		/**
 		 * Builds link for browsing current item on Front-End
 		 *
 		 * @param Array $params
 		 * @return string
 		 */
 		function PageBrowseLink($params)
 		{
+			/** @var kThemesHelper $themes_helper */
 			$themes_helper = $this->Application->recallObject('ThemesHelper');
-			/* @var $themes_helper kThemesHelper */
 
+			/** @var SiteConfigHelper $site_config_helper */
 			$site_config_helper = $this->Application->recallObject('SiteConfigHelper');
-			/* @var $site_config_helper SiteConfigHelper */
 
 			$settings = $site_config_helper->getSettings();
 
 			$params['editing_mode'] = $settings['default_editing_mode'];
 			$params['m_theme'] = $themes_helper->getCurrentThemeId();
 			$params['admin'] = 1;
 
 			return $this->ItemLink($params);
 		}
 
 		function CategoryPath($params)
 		{
 			if ($this->Application->isAdminUser) {
 				// path for module root category in admin
 				if (!isset($params['cat_id'])) {
 					$params['cat_id'] = $this->Application->RecallVar($params['session_var'], 0);
 				}
 			}
 			else {
 				// path for category item category in front-end
 				$object = $this->getObject($params);
 				$params['cat_id'] = $object->GetDBField('CategoryId');
 			}
 
+			/** @var kNavigationBar $navigation_bar */
 			$navigation_bar = $this->Application->recallObject('kNavigationBar');
-			/* @var $navigation_bar kNavigationBar */
 
 			return $navigation_bar->build($params);
 		}
 
 		function BuildListSpecial($params)
 		{
 			if ($this->Special != '') return $this->Special;
 			if ( isset($params['parent_cat_id']) ) {
 				$parent_cat_id = $params['parent_cat_id'];
 			}
 			else {
 				$parent_cat_id = $this->Application->GetVar('c_id');
 				if (!$parent_cat_id) {
 					$parent_cat_id = $this->Application->GetVar('m_cat_id');
 				}
 			}
 
 			$recursive = isset($params['recursive']);
 
 			$list_unique_key = $this->getUniqueListKey($params).$recursive;
 			if ($list_unique_key == '') {
 				return parent::BuildListSpecial($params);
 			}
 
 			return crc32($parent_cat_id.$list_unique_key);
 		}
 
 		function CatalogItemCount($params)
 		{
 			$params['skip_quering'] = true;
 			$object =& $this->GetList($params);
 
 			return $object->GetRecordsCount(false) != $object->GetRecordsCount() ? $object->GetRecordsCount().' / '.$object->GetRecordsCount(false) : $object->GetRecordsCount();
 		}
 
 		function ListReviews($params)
 		{
 			$prefix = $this->Prefix . '-rev';
 
+			/** @var kDBTagProcessor $review_tag_processor */
 			$review_tag_processor = $this->Application->recallObject($prefix . '.item_TagProcessor');
-			/* @var $review_tag_processor kDBTagProcessor */
 
 			return $review_tag_processor->PrintList($params);
 		}
 
 		function ReviewCount($params)
 		{
+			/** @var kDBTagProcessor $review_tag_processor */
 			$review_tag_processor = $this->Application->recallObject('rev.item_TagProcessor');
-			/* @var $review_tag_processor kDBTagProcessor */
 
 			return $review_tag_processor->TotalRecords($params);
 		}
 
 		function InitCatalogTab($params)
 		{
 			$tab_params['mode'] = $this->Application->GetVar('tm'); // single/multi selection possible
 			$tab_params['special'] = $this->Application->GetVar('ts'); // use special for this tab
 			$tab_params['dependant'] = $this->Application->GetVar('td'); // is grid dependant on categories grid
 
 			// set default params (same as in catalog)
 			if ($tab_params['mode'] === false) $tab_params['mode'] = 'multi';
 			if ($tab_params['special'] === false) $tab_params['special'] = '';
 			if ($tab_params['dependant'] === false) $tab_params['dependant'] = 'yes';
 
 			// pass params to block with tab content
 			$params['name'] = $params['render_as'];
 			$special = $tab_params['special'] ? $tab_params['special'] : $this->Special;
 
 			$params['prefix'] = trim($this->Prefix.'.'.$special, '.');
 
 			$prefix_append = $this->Application->GetVar('prefix_append');
 			if ($prefix_append) {
 				$params['prefix'] .= $prefix_append;
 			}
 
 			$default_grid = array_key_exists('default_grid', $params) ? $params['default_grid'] : 'Default';
 			$radio_grid = array_key_exists('radio_grid', $params) ? $params['radio_grid'] : 'Radio';
 
 
 			$params['cat_prefix'] = trim('c.'.$special, '.');
 			$params['tab_mode'] = $tab_params['mode'];
 			$params['grid_name'] = ($tab_params['mode'] == 'multi') ? $default_grid : $radio_grid;
 			$params['tab_dependant'] = $tab_params['dependant'];
 			$params['show_category'] = $tab_params['special'] == 'showall' ? 1 : 0; // this is advanced view -> show category name
 
 			if ($special == 'showall' || $special == 'user') {
 				$params['grid_name'] .= 'ShowAll';
 			}
 
 			// use $pass_params to be able to pass 'tab_init' parameter from m_ModuleInclude tag
 			return $this->Application->ParseBlock($params, 1);
 		}
 
 		/**
 		 * Show CachedNavbar of current item primary category
 		 *
 		 * @param Array $params
 		 * @return string
 		 */
 		function CategoryName($params)
 		{
 			// show category cachednavbar of
 			$object = $this->getObject($params);
 			$category_id = isset($params['cat_id']) ? $params['cat_id'] : $object->GetDBField('CategoryId');
 
 			$cache_key = 'category_paths[%CIDSerial:' . $category_id . '%][%PhrasesSerial%][Adm:' . (int)$this->Application->isAdmin . ']';
 			$category_path = $this->Application->getCache($cache_key);
 
 			if ($category_path === false) {
 				// not chached
 				if ($category_id > 0) {
 					$cached_navbar = preg_replace('/^(Content&\|&|Content)/i', '', $object->GetField('CachedNavbar'));
 					$category_path = trim($this->CategoryName( Array('cat_id' => 0) ).' > '.str_replace('&|&', ' > ', $cached_navbar), ' > ');
 				}
 				else {
 					$category_path = $this->Application->Phrase(($this->Application->isAdmin ? 'la_' : 'lu_') . 'rootcategory_name');
 				}
 
 				$this->Application->setCache($cache_key, $category_path);
 			}
 
 			return $category_path;
 		}
 
 		/**
 		 * Allows to determine if original value should be shown
 		 *
 		 * @param Array $params
 		 * @return bool
 		 */
 		function DisplayOriginal($params)
 		{
 			// original id found & greater then zero + show original
 			$display_original = isset($params['display_original']) && $params['display_original'];
 
 			$object = $this->getObject($params);
 			/* @var $object kCatDBItem */
 
 			$owner_field = $this->getUnitConfig()->getOwnerField('CreatedById');
 			$perm_value = $this->PermHelper->ModifyCheckPermission($object->GetDBField($owner_field), $object->GetDBField('CategoryId'), $this->Prefix);
 
 			return $display_original && ($perm_value == 1) && $this->Application->GetVar($this->Prefix.'.original_id');
 		}
 
 		/**
 		 * Checks if user have one of required permissions
 		 *
 		 * @param Array $params
 		 * @return bool
 		 */
 		function HasPermission($params)
 		{
+			/** @var kPermissionsHelper $perm_helper */
 			$perm_helper = $this->Application->recallObject('PermissionsHelper');
-			/* @var $perm_helper kPermissionsHelper */
 
 			$params['raise_warnings'] = 0;
+
+			/** @var kCatDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kCatDBItem */
 
 			// 1. category restriction
 			$params['cat_id'] = $object->isLoaded() ? $object->GetDBField('ParentPath') : $this->Application->GetVar('m_cat_id');
 
 			// 2. owner restriction
 			$owner_field = $this->getUnitConfig()->getOwnerField('CreatedById');
 
 			$is_owner = $object->GetDBField($owner_field) == $this->Application->RecallVar('user_id');
 
 			return $perm_helper->TagPermissionCheck($params, $is_owner);
 		}
 
 		/**
 		 * Creates link to current category or to module root category, when current category is home
 		 *
 		 * @param Array $params
 		 * @return string
 		 */
 		function SuggestItemLink($params)
 		{
 			if (!isset($params['cat_id'])) {
 				$params['cat_id'] = $this->Application->GetVar('m_cat_id');
 			}
 
 			if ($params['cat_id'] == 0) {
 				$params['cat_id'] = $this->Application->findModule('Var', $this->Prefix, 'RootCat');
 			}
 
 			$params['m_cat_page'] = 1;
 
 			return $this->Application->ProcessParsedTag('c', 'CategoryLink', $params);
 		}
 
 		/**
 		 * Allows to detect if item has any additional images available
 		 *
 		 * @param Array $params
 		 * @return string
 		 */
 		function HasAdditionalImages($params)
 		{
+			/** @var kDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBItem */
 
 			$cache_key = $object->Prefix . '_additional_images[%' . $this->Application->incrementCacheSerial($object->Prefix, $object->GetID(), false) . '%]';
 			$ret = $this->Application->getCache($cache_key);
 
 			if ( $ret === false ) {
 				$this->Conn->nextQueryCachable = true;
 				$sql = 'SELECT ImageId
 						FROM ' . $this->Application->getUnitConfig('img')->getTableName() . '
 						WHERE ResourceId = ' . $object->GetDBField('ResourceId') . ' AND DefaultImg != 1 AND Enabled = 1';
 				$ret = $this->Conn->GetOne($sql) ? 1 : 0;
 
 				$this->Application->setCache($cache_key, $ret);
 			}
 
 			return $ret;
 		}
 
 		/**
 		 * Checks that item is pending
 		 *
 		 * @param Array $params
 		 * @return bool
 		 */
 		function IsPending($params)
 		{
 			$object = $this->getObject($params);
 
 			$pending_status = Array (STATUS_PENDING, STATUS_PENDING_EDITING);
 			return in_array($object->GetDBField('Status'), $pending_status);
 		}
 
 		function IsFavorite($params)
 		{
 			static $favorite_status = Array ();
 
+			/** @var kDBList $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBList */
 
 			if ( !isset($favorite_status[$this->Special]) ) {
 				$resource_ids = $object->GetCol('ResourceId');
 
 				$user_id = $this->Application->RecallVar('user_id');
 				$sql = 'SELECT FavoriteId, ResourceId
 						FROM ' . $this->Application->getUnitConfig('fav')->getTableName() . '
 						WHERE (PortalUserId = ' . $user_id . ') AND (ResourceId IN (' . implode(',', $resource_ids) . '))';
 				$favorite_status[$this->Special] = $this->Conn->GetCol($sql, 'ResourceId');
 			}
 
 			return isset($favorite_status[$this->Special][$object->GetDBField('ResourceId')]);
 		}
 
 		/**
 		 * Returns item's editors pick status (using not formatted value)
 		 *
 		 * @param Array $params
 		 * @return bool
 		 */
 		function IsEditorsPick($params)
 		{
 			$object = $this->getObject($params);
 
 			return $object->GetDBField('EditorsPick') == 1;
 		}
 
 		function FavoriteToggleLink($params)
 		{
 			$fav_prefix = $this->Prefix.'-fav';
 
 			$params['pass'] = implode(',', Array('m', $this->Prefix, $fav_prefix));
 			$params[$fav_prefix.'_event'] = 'OnFavoriteToggle';
 
 			return $this->ItemLink($params);
 		}
 
 		/**
 		 * Checks if item is passed in url
 		 *
 		 * @param Array $params
 		 * @return bool
 		 */
 		function ItemAvailable($params)
 		{
 			return $this->Application->GetVar($this->getPrefixSpecial().'_id') > 0;
 		}
 
 		function SortingSelected($params)
 		{
 			$list =& $this->GetList($params);
 			$user_sorting_start = $this->getUserSortIndex();
 
 			// remove language prefix from $current_sorting_field
 			$current_sorting_field = preg_replace('/^l[\d]+_(.*)/', '\\1', $list->GetOrderField($user_sorting_start));
 			$current_sorting = $current_sorting_field . '|' . $list->GetOrderDirection($user_sorting_start);
 
 			return strtolower($current_sorting) == strtolower($params['sorting']) ? $params['selected'] : '';
 		}
 
 		function CombinedSortingDropDownName($params)
 		{
 			$list =& $this->GetList($params);
 
 			if ($list->isMainList()) {
 				return parent::CombinedSortingDropDownName($params);
 			}
 
 			return $list->Prefix . '_CombinedSorting';
 		}
 
 		/**
 		 * Prepares name for field with event in it (used only on front-end)
 		 *
 		 * @param Array $params
 		 * @return string
 		 */
 		function SubmitName($params)
 		{
 			$list =& $this->GetList($params);
 
 			if ($list->isMainList()) {
 				return parent::SubmitName($params);
 			}
 
 			return 'events[' . $list->Prefix . '][' . $params['event'] . ']';
 		}
 
 		/**
 		 * Returns prefix + any word (used for shared between categories per page settings)
 		 *
 		 * @param Array $params
 		 * @return string
 		 */
 		function VarName($params)
 		{
 			$list =& $this->GetList($params);
 
 			if ($list->isMainList()) {
 				return parent::VarName($params);
 			}
 
 			return $list->Prefix . '_' . $params['type'];
 		}
 
 		/**
 		 * Checks if we are viewing module root category
 		 *
 		 * @param Array $params
 		 * @return bool
 		 */
 		function IsModuleHome($params)
 		{
 			$root_category = $this->Application->findModule('Var', $this->Prefix, 'RootCat');
 
 			return $root_category == $this->Application->GetVar('m_cat_id');
 		}
 
 		/**
 		 * Dynamic votes indicator
 		 *
 		 * @param Array $params
 		 *
 		 * @return string
 		 */
 		function VotesIndicator($params)
 		{
+			/** @var kDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBItem */
 
+			/** @var RatingHelper $rating_helper */
 			$rating_helper = $this->Application->recallObject('RatingHelper');
-			/* @var $rating_helper RatingHelper */
 
 			$small_style = array_key_exists('small_style', $params) ? $params['small_style'] : false;
 
 			return $rating_helper->ratingBar($object, true, '', $small_style);
 		}
 
 		function RelevanceIndicator($params)
 		{
 			$object = $this->getObject($params);
 
 			/** @var kSearchHelper $search_helper */
 			$search_helper = $this->Application->recallObject('SearchHelper');
 
 			$search_results_table = $search_helper->getSearchTable();
 			$sql = 'SELECT Relevance
 					FROM '.$search_results_table.'
 					WHERE ResourceId = '.$object->GetDBField('ResourceId');
 
 	    	$percents_off = (int)(100 - (100 * $this->Conn->GetOne($sql)));
 	    	$percents_off = ($percents_off < 0) ? 0 : $percents_off;
 	    	if ($percents_off) {
 	        	$params['percent_off'] = $percents_off;
 	    		$params['percent_on'] = 100 - $percents_off;
 	        	$params['name'] = $this->SelectParam($params, 'relevance_normal_render_as,block_relevance_normal');
 	    	}
 	    	else {
 	    		$params['name'] = $this->SelectParam($params, 'relevance_full_render_as,block_relevance_full');
 	    	}
 	    	return $this->Application->ParseBlock($params);
 		}
 
 		function SearchResultField($params)
 		{
 			$ret = $this->Field($params);
 
 			$keywords = unserialize( $this->Application->RecallVar('highlight_keywords') );
 			$opening = $this->Application->ParseBlock( Array('name' => $this->SelectParam($params, 'highlight_opening_render_as,block_highlight_opening')) );
 			$closing = $this->Application->ParseBlock( Array('name' => $this->SelectParam($params, 'highlight_closing_render_as,block_highlight_closing')) );
 
 			foreach ($keywords as $index => $keyword) {
 				$keywords[$index] = preg_quote($keyword, '/');
 			}
 
 			return preg_replace('/('.implode('|', $keywords).')/i', $opening.'\\1'.$closing, $ret);
 		}
 
 		/**
 		 * Shows keywords, that user searched
 		 *
 		 * @param Array $params
 		 * @return bool
 		 */
 		function SearchKeywords($params)
 		{
 			$keywords = $this->Application->GetVar('keywords');
 			$sub_search = $this->Application->GetVar('search_type') == 'subsearch';
 
 			return ($keywords !== false) && !$sub_search ? $keywords : $this->Application->RecallVar('keywords');
 		}
 
 		function AdvancedSearchForm($params)
 		{
 			$search_table = $this->Application->getUnitConfig('confs')->getTableName();
 			$module_name = $this->Application->findModule('Var', $this->Prefix, 'Name');
 
 			$sql = 'SELECT *
 					FROM ' . $search_table . '
 					WHERE (ModuleName = ' . $this->Conn->qstr($module_name) . ') AND (AdvancedSearch = 1)
 					ORDER BY DisplayOrder';
 			$search_config = $this->Conn->Query($sql);
 
 			$ret = '';
 
 			foreach ($search_config as $record) {
 				$params['name'] = $this->SelectParam($params, 'and_or_render_as,and_or_block');
 				$params['field'] = $record['FieldName'];
 				$params['andor'] = $this->Application->ParseBlock($params);
 
 				$params['name'] = $this->SelectParam($params, $record['FieldType'] . '_render_as,' . $record['FieldType'] . '_block');
 				$params['caption'] = $this->Application->Phrase($record['DisplayName']);
 				$ret .= $this->Application->ParseBlock($params);
 			}
 
 			return $ret;
 		}
 
 		/**
 		 * Returns last modification date of items in category / system
 		 *
 		 * @param Array $params
 		 * @return string
 		 */
 		function LastUpdated($params)
 		{
 			$category_id = (int)$this->Application->GetVar('m_cat_id');
 			$local = array_key_exists('local', $params) && ($category_id > 0) ? $params['local'] : false;
 
 			$serial_name1 = $this->Application->incrementCacheSerial('c', $local ? $category_id : null, false);
 			$serial_name2 = $this->Application->incrementCacheSerial($this->Prefix, null, false);
 			$cache_key = 'categoryitems_last_updated[%' . $serial_name1 . '%][%' . $serial_name2 . '%]';
 
 			$row_data = $this->Application->getCache($cache_key);
 
 			if ( $row_data === false ) {
 				$config = $this->getUnitConfig();
 
 				if ( $local && ($category_id > 0) ) {
 					// scan only current category & it's children
 					list ($tree_left, $tree_right) = $this->Application->getTreeIndex($category_id);
 
 					$sql = 'SELECT MAX(item_table.Modified) AS ModDate, MAX(item_table.CreatedOn) AS NewDate
 			        		FROM ' . $config->getTableName() . ' item_table
 			        		LEFT JOIN ' . TABLE_PREFIX . 'CategoryItems ci ON (item_table.ResourceId = ci.ItemResourceId)
 			        		LEFT JOIN ' . TABLE_PREFIX . 'Categories c ON c.CategoryId = ci.CategoryId
 			        		WHERE c.TreeLeft BETWEEN ' . $tree_left . ' AND ' . $tree_right;
 				}
 				else {
 					// scan all categories in system
 					$sql = 'SELECT MAX(Modified) AS ModDate, MAX(CreatedOn) AS NewDate
 			       			FROM ' . $config->getTableName();
 				}
 
 				$this->Conn->nextQueryCachable = true;
 				$row_data = $this->Conn->GetRow($sql);
 				$this->Application->setCache($cache_key, $row_data);
 			}
 
 			if ( !$row_data ) {
 				return '';
 			}
 
 			$date = $row_data[$row_data['NewDate'] > $row_data['ModDate'] ? 'NewDate' : 'ModDate'];
 
 			// format date
 			$format = isset($params['format']) ? $params['format'] : '_regional_DateTimeFormat';
 
 			if ( preg_match("/_regional_(.*)/", $format, $regs) ) {
+				/** @var LanguagesItem $lang */
 				$lang = $this->Application->recallObject('lang.current');
-				/* @var $lang LanguagesItem */
 
 				if ( $regs[1] == 'DateTimeFormat' ) {
 					// combined format
 					$format = $lang->GetDBField('DateFormat') . ' ' . $lang->GetDBField('TimeFormat');
 				}
 				else {
 					// simple format
 					$format = $lang->GetDBField($regs[1]);
 				}
 			}
 
 			return date($format, $date);
 		}
 
 		/**
 		 * Counts category item count in system (not category-dependent)
 		 *
 		 * @param Array $params
 		 * @return int
 		 */
 		function ItemCount($params)
 		{
+			/** @var kCountHelper $count_helper */
 			$count_helper = $this->Application->recallObject('CountHelper');
-			/* @var $count_helper kCountHelper */
 
 			$today_only = isset($params['today']) && $params['today'];
 			return $count_helper->ItemCount($this->Prefix, $today_only);
 		}
 
 		/**
 		 * Displays list of allowed categories on "Suggest Link" and similar forms.
 		 *
 		 * @param array $params Tag params.
 		 *
 		 * @return string
 		 * @access protected
 		 */
 		protected function CategorySelector($params)
 		{
 			$category_id = isset($params['category_id']) && is_numeric($params['category_id']) ? $params['category_id'] : false;
 
 			if ( $category_id === false ) {
 				// if category id not given use module root category
 				$category_id = $this->Application->findModule('Var', $this->Prefix, 'RootCat');
 			}
 
 			$id_field = $this->Application->getUnitConfig('c')->getIDField();
 
 			// get category list (permission based)
 			$categories = $this->Conn->Query($this->getCategorySelectorQuery($category_id), $id_field);
 
 			$block_params = $this->prepareTagParams($params);
 			$block_params['name'] = $params['render_as'];
 			$block_params['strip_nl'] = 2;
 
 			$ret = '';
 
 			foreach ($categories as $category_id => $category_data) {
 				// print category
 				$block_params['separator'] = isset($params['category_id']) ? $params['separator'] : ''; // return original separator, remove separator for top level categories
 				$block_params['category_id'] = $category_id;
 				$block_params['category_name'] = $category_data['CategoryName'];
 
 				$cached_navbar = preg_replace('/^(Content&\|&|Content)/i', '', $category_data['CachedNavbar']);
 				$block_params['full_path'] = str_replace('&|&', ' > ', $cached_navbar);
 
 				$ret .= $this->Application->ParseBlock($block_params);
 
 				// print it's children
 				$block_params['separator'] = '&nbsp;&nbsp;&nbsp;' . $params['separator'];
 				$ret .= $this->CategorySelector($block_params);
 			}
 
 			return $ret;
 		}
 
 		/**
 		 * Returns given category sub-categories, that user have rights to view.
 		 *
 		 * @param int $category_id Category.
 		 *
 		 * @return array
 		 * @access protected
 		 */
 		protected function getCategorySelectorQuery($category_id)
 		{
 			$category_config = $this->Application->getUnitConfig('c');
 			$title_field = $category_config->getTitleField();
 
 			$where_clause = Array (
 				'c.ParentId = ' . $category_id,
 				'c.Status = ' . STATUS_ACTIVE,
 			);
 
 			$sql = 'SELECT	c.' . $title_field . ' AS CategoryName,
 							c.' . $category_config->getIDField() . ',
 							c.l' . $this->Application->GetVar('m_lang') . '_CachedNavbar AS CachedNavbar
 					FROM ' . $category_config->getTableName() . ' c';
 
+			/** @var kCountHelper $count_helper */
 			$count_helper = $this->Application->recallObject('CountHelper');
-			/* @var $count_helper kCountHelper */
 
 			list ($sql, $where_clause) = $count_helper->attachViewPermissionCheck('c', $sql, $where_clause);
 
 			return $sql . ' WHERE (' . implode(') AND (', $where_clause) . ') ORDER BY c.' . $title_field . ' ASC';
 		}
 
 		function PrintMoreCategories($params)
 		{
+			/** @var kDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBItem */
 
 			$category_ids = $this->Field($params);
 			if (!$category_ids) {
 				return '';
 			}
 
 			$category_ids = explode('|', substr($category_ids, 1, -1));
 			$category_config = $this->Application->getUnitConfig('c');
 
 			$id_field = $category_config->getIDField();
 			$title_field = $category_config->getTitleField();
 			$table_name = $category_config->getTableName();
 
 			$sql = 'SELECT '.$title_field.' AS CategoryName, '.$id_field.', l' . $this->Application->GetVar('m_lang') . '_CachedNavbar AS CachedNavbar
 					FROM '.$table_name.'
 					WHERE '.$id_field.' IN ('.implode(',', $category_ids).')';
 			$categories = $this->Conn->Query($sql, $id_field);
 
 			$block_params = $this->prepareTagParams($params);
 			$block_params['name'] = $params['render_as'];
 
 			$ret = '';
 			foreach ($categories as $category_id => $category_data) {
 				$block_params['category_id'] = $category_id;
 				$block_params['category_name'] = $category_data['CategoryName'];
 
 				$cached_navbar = preg_replace('/^(Content&\|&|Content)/i', '', $category_data['CachedNavbar']);
 				$block_params['full_path'] = str_replace('&|&', ' > ', $cached_navbar);
 
 				$ret .= $this->Application->ParseBlock($block_params);
 			}
 
 			return $ret;
 		}
 
 		function DownloadFileLink($params)
 		{
 			$params[$this->getPrefixSpecial().'_event'] = 'OnDownloadFile';
 
 			return $this->ItemLink($params);
 		}
 
 		function ImageSrc($params)
 		{
 			list ($ret, $tag_processed) = $this->processAggregatedTag('ImageSrc', $params, $this->getPrefixSpecial());
 			return $tag_processed ? $ret : false;
 		}
 
 		/**
 		 * Registers hit for item (one time per session)
 		 *
 		 * @param Array $params
 		 */
 		function RegisterHit($params)
 		{
+			/** @var kCatDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kCatDBItem */
 
 			if ($object->isLoaded()) {
 				$object->RegisterHit();
 			}
 		}
 
 		/**
 		 * Returns link to item's author public profile
 		 *
 		 * @param Array $params
 		 * @return string
 		 */
 		function ProfileLink($params)
 		{
 			$object = $this->getObject($params);
 			$owner_field = array_key_exists('owner_field', $params) ? $params['owner_field'] : 'CreatedById';
 			$params['user_id'] = $object->GetDBField($owner_field);
 			unset($params['owner_field']);
 
 			return $this->Application->ProcessParsedTag('m', 'Link', $params);
 		}
 
 		/**
 		 * Checks, that "view in browse mode" functionality available
 		 *
 		 * @param Array $params
 		 * @return bool
 		 */
 		function BrowseModeAvailable($params)
 		{
 			$valid_special = $valid_special = $params['Special'] != 'user';
 			$not_selector = $this->Application->GetVar('type') != 'item_selector';
 
 			return $valid_special && $not_selector;
 		}
 
 		/**
 		 * Returns a link for editing product
 		 *
 		 * @param Array $params
 		 * @return string
 		 */
 		function ItemEditLink($params)
 		{
+			/** @var kDBList $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBList */
 
 			$config = $this->getUnitConfig();
 			$edit_template = $config->getAdminTemplatePath() . '/' . $config->getAdminTemplatePrefix() . 'edit';
 
 			$url_params = Array (
 				'm_opener'				=>	'd',
 				$this->Prefix.'_mode'	=>	't',
 				$this->Prefix.'_event'	=>	'OnEdit',
 				$this->Prefix.'_id'		=>	$object->GetID(),
 				'm_cat_id'				=>	$object->GetDBField('CategoryId'),
 				'pass'					=>	'all,'.$this->Prefix,
 				'no_pass_through'		=>	1,
 			);
 
 			return $this->Application->HREF($edit_template,'', $url_params);
 		}
 
 		function LanguageVisible($params)
 		{
 			$field = $this->SelectParam($params, 'name,field');
 
 			preg_match('/l([\d]+)_(.*)/', $field, $regs);
 			$params['name'] = $regs[2];
 
 			return $this->HasLanguageError($params) || $this->Application->GetVar('m_lang') == $regs[1];
 		}
 
 		function HasLanguageError($params)
 		{
 			static $languages = null;
 
 			if ( !isset($languages) ) {
 				$language_config = $this->Application->getUnitConfig('lang');
 
 				$sql = 'SELECT ' . $language_config->getIDField() . '
 						FROM ' . $language_config->getTableName() . '
 						WHERE Enabled = 1';
 				$languages = $this->Conn->GetCol($sql);
 			}
 
 			$field = $this->SelectParam($params, 'name,field');
 
+			/** @var kDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBItem */
 
 			foreach ($languages as $language_id) {
 				$check_field = 'l' . $language_id . '_' . $field;
 
 				if ( $object->GetErrorMsg($check_field, false) ) {
 					return true;
 				}
 			}
 
 			return false;
 		}
 
 		/**
 		 * Returns list of categories, that have add/edit permission for current category item type
 		 *
 		 * @param Array $params
 		 * @return string
 		 */
 		function AllowedCategoriesJSON($params)
 		{
 			if ( $this->Application->RecallVar('user_id') == USER_ROOT ) {
 				$categories = true;
 			}
 			else {
+				/** @var kDBItem $object */
 				$object = $this->getObject($params);
-				/* @var $object kDBItem */
 
+				/** @var kPermissionsHelper $perm_helper */
 				$perm_helper = $this->Application->recallObject('PermissionsHelper');
-				/* @var $perm_helper kPermissionsHelper */
 
 				$perm_prefix = $this->getUnitConfig()->getPermItemPrefix();
 				$categories = $perm_helper->getPermissionCategories($perm_prefix . '.' . ($object->IsNewItem() ? 'ADD' : 'MODIFY'));
 			}
 
 			return json_encode($categories);
 		}
 	}
Index: branches/5.3.x/core/kernel/db/dblist.php
===================================================================
--- branches/5.3.x/core/kernel/db/dblist.php	(revision 16518)
+++ branches/5.3.x/core/kernel/db/dblist.php	(revision 16519)
@@ -1,1769 +1,1769 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 /**
 * DBList
 *
 */
 class kDBList extends kDBBase implements Iterator, Countable {
 
 	// kDBList filter types (then, types are divided into classes)
 
 	/**
 	 * Having filter [step1]
 	 *
 	 */
 	const HAVING_FILTER = 1;
 
 	/**
 	 * Where filter [step1]
 	 *
 	 */
 	const WHERE_FILTER = 2;
 
 	/**
 	 * Aggregated filter [step1]
 	 *
 	 */
 	const AGGREGATE_FILTER = 3;
 
 	/**
 	 * System filter [step2, AND]
 	 *
 	 */
 	const FLT_SYSTEM = 1;
 
 	/**
 	 * User filter [step2, OR]
 	 * @deprecated
 	 *
 	 */
 	const FLT_NORMAL = 2;
 
 	/**
 	 * User "Search" filter [step2, OR]
 	 *
 	 */
 	const FLT_SEARCH = 3;
 
 	/**
 	 * User "View Menu" filter [step2, AND]
 	 *
 	 */
 	const FLT_VIEW = 4;
 
 	/**
 	 * User "Custom" (above grid columns) filter [step2, AND]
 	 *
 	 */
 	const FLT_CUSTOM = 5;
 
 	/**
 	 * kMultipleFilter AND filter [step3]
 	 *
 	 */
 	const FLT_TYPE_AND = 'AND';
 
 	/**
 	 * kMultipleFilter OR filter [step3]
 	 *
 	 */
 	const FLT_TYPE_OR = 'OR';
 
 	/**
 	 * Totals for fields specified in config
 	 *
 	 * @var Array
 	 * @access protected
 	 */
 	protected $Totals = Array ();
 
 	/**
 	 * Remembers if totals were calculated
 	 *
 	 * @var bool
 	 * @access protected
 	 */
 	protected $TotalsCalculated = false;
 
 	/**
 	* List of "ORDER BY" fields
 	*
 	* @var Array
 	* @access protected
 	*/
 	protected $OrderFields = Array ();
 
 	/**
 	* Counted total number of records in the query - without pagination (system+user filters)
 	*
 	* @var int
 	* @access protected
 	*/
 	protected $RecordsCount = 0;
 
 	/**
 	 * Record count with only system filters applied
 	 *
 	 * @var int
 	 * @access protected
 	 */
 	protected $NoFilterCount = 0;
 
 	/**
 	 * Record count selected to be showed on current page
 	 *
 	 * @var int
 	 * @access protected
 	 */
 	protected $SelectedCount = 0;
 
 	/**
 	 * Array of selected records
 	 *
 	 * @var Array
 	 * @access public
 	 */
 	public $Records;
 
 	/**
 	 * Current record index
 	 *
 	 * @var int
 	 * @access protected
 	 */
 	protected $CurrentIndex = 0;
 
 	/**
 	* List items per-page
 	*
 	* @var int
 	* @access protected
 	*/
 	protected $PerPage;
 
 	/**
 	* Page count in list based on PerPage & RecordsCount attributes
 	*
 	* @var int
 	* @access protected
 	*/
 	protected $TotalPages;
 
 	/**
 	* Current page number - used when forming LIMIT clause of SELECT statement
 	*
 	* @var int
 	* @access protected
 	*/
 	protected $Page;
 
 	/**
 	* Offset for LIMIT clause, calculated in {@link kDBList::PerPage()}
 	*
 	* @var int
 	* @access protected
 	*/
 	protected $Offset;
 
 	/**
 	 * WHERE filter objects
 	 *
 	 * @var kMultipleFilter[]
 	 * @access protected
 	 */
 	protected $WhereFilter = Array ();
 
 	/**
 	 * HAVING filter objects
 	 *
 	 * @var kMultipleFilter[]
 	 * @access protected
 	 */
 	protected $HavingFilter = Array ();
 
 	/**
 	 * AGGREGATED filter objects
 	 *
 	 * @var kMultipleFilter[]
 	 * @access protected
 	 */
 	protected $AggregateFilter = Array ();
 
 	/**
 	 * List of "GROUP BY" fields
 	 *
 	 * @var Array
 	 * @access protected
 	 */
 	protected $GroupByFields = Array ();
 
 	/**
 	 * Remembers if list was queried
 	 *
 	 * @var bool
 	 * @access protected
 	 */
 	protected $Queried = false;
 
 	/**
 	 * Remembers if list was counted
 	 *
 	 * @var bool
 	 * @access protected
 	 */
 	protected $Counted = false;
 
 	/**
 	 * Name of the grid, used to display the list
 	 *
 	 * @var string
 	 */
 	var $gridName = '';
 
 	/**
 	 * Identifies this list as main on the page, that allows to react on "page", "per_page" and "sort_by" parameters from url
 	 *
 	 * @var bool
 	 * @access protected
 	 */
 	protected $mainList = false;
 
 	/**
 	 * Holds field errors
 	 *
 	 * @var Array
 	 * @access protected
 	 */
 	protected $FieldErrors = Array ();
 
 	/**
 	* Creates kDBList
 	*
 	* @return kDBList
 	* @access public
 	*/
 	public function __construct()
 	{
 		parent::__construct();
 		$this->OrderFields = Array();
 
 		foreach ( $this->getFilterStructure() as $filter_params ) {
 			$property_name = $filter_params['type'];
 			$filter_group =& $this->$property_name;
 
 			$filter_group[$filter_params['class']] = $this->Application->makeClass(
 				'kMultipleFilter',
 				array($filter_params['join_using'])
 			);
 		}
 
 		$this->PerPage = -1;
 	}
 
 	function setGridName($grid_name)
 	{
 		$this->gridName = $grid_name;
 	}
 
 	/**
 	 * Returns information about all possible filter types
 	 *
 	 * @return Array
 	 * @access protected
 	 */
 	protected function getFilterStructure()
 	{
 		$filters = 	Array (
 							Array ('type' => 'WhereFilter', 'class' => self::FLT_SYSTEM, 'join_using' => self::FLT_TYPE_AND),
 							Array ('type' => 'WhereFilter', 'class' => self::FLT_NORMAL, 'join_using' => self::FLT_TYPE_OR),
 							Array ('type' => 'WhereFilter', 'class' => self::FLT_SEARCH, 'join_using' => self::FLT_TYPE_OR),
 							Array ('type' => 'WhereFilter', 'class' => self::FLT_VIEW, 'join_using' => self::FLT_TYPE_AND),
 							Array ('type' => 'WhereFilter', 'class' => self::FLT_CUSTOM, 'join_using' => self::FLT_TYPE_AND),
 
 							Array ('type' => 'HavingFilter', 'class' => self::FLT_SYSTEM, 'join_using' => self::FLT_TYPE_AND),
 							Array ('type' => 'HavingFilter', 'class' => self::FLT_NORMAL, 'join_using' => self::FLT_TYPE_OR),
 							Array ('type' => 'HavingFilter', 'class' => self::FLT_SEARCH, 'join_using' => self::FLT_TYPE_OR),
 							Array ('type' => 'HavingFilter', 'class' => self::FLT_VIEW, 'join_using' => self::FLT_TYPE_AND),
 							Array ('type' => 'HavingFilter', 'class' => self::FLT_CUSTOM, 'join_using' => self::FLT_TYPE_AND),
 
 							Array ('type' => 'AggregateFilter', 'class' => self::FLT_SYSTEM, 'join_using' => self::FLT_TYPE_AND),
 							Array ('type' => 'AggregateFilter', 'class' => self::FLT_NORMAL, 'join_using' => self::FLT_TYPE_OR),
 							Array ('type' => 'AggregateFilter', 'class' => self::FLT_VIEW, 'join_using' => self::FLT_TYPE_AND),
 					);
 
 		return $filters;
 	}
 
 	/**
 	 * Adds new or replaces old filter with same name
 	 *
 	 * @param string $name filter name (for internal use)
 	 * @param string $clause where/having clause part (no OR/AND allowed)
 	 * @param int $filter_type is filter having filter or where filter
 	 * @param int $filter_scope filter subtype: FLT_NORMAL,FLT_SYSTEM,FLT_SEARCH,FLT_VIEW,FLT_CUSTOM
 	 * @access public
 	 */
 	public function addFilter($name, $clause, $filter_type = self::WHERE_FILTER, $filter_scope = self::FLT_SYSTEM)
 	{
 		$this->getFilterCollection($filter_type, $filter_scope)->addFilter($name, $clause);
 	}
 
 	/**
 	 * Reads filter content
 	 *
 	 * @param string $name filter name (for internal use)
 	 * @param int $filter_type is filter having filter or where filter
 	 * @param int $filter_scope filter subtype: FLT_NORMAL,FLT_SYSTEM,FLT_SEARCH,FLT_VIEW,FLT_CUSTOM
 	 * @return string
 	 * @access public
 	 */
 	public function getFilter($name, $filter_type = self::WHERE_FILTER, $filter_scope = self::FLT_SYSTEM)
 	{
 		return $this->getFilterCollection($filter_type, $filter_scope)->getFilter($name);
 	}
 
 	/**
 	 * Removes specified filter from filters list
 	 *
 	 * @param string $name filter name (for internal use)
 	 * @param int $filter_type is filter having filter or where filter
 	 * @param int $filter_scope filter subtype: FLT_NORMAL,FLT_SYSTEM,FLT_SEARCH,FLT_VIEW,FLT_CUSTOM
 	 * @access public
 	 */
 	public function removeFilter($name, $filter_type = self::WHERE_FILTER, $filter_scope = self::FLT_SYSTEM)
 	{
 		$this->getFilterCollection($filter_type, $filter_scope)->removeFilter($name);
 	}
 
 	/**
 	 * Returns filter collection.
 	 *
 	 * @param integer $filter_type  Is filter having filter or where filter.
 	 * @param integer $filter_scope Filter subtype: FLT_NORMAL,FLT_SYSTEM,FLT_SEARCH,FLT_VIEW,FLT_CUSTOM.
 	 *
 	 * @return kMultipleFilter
 	 */
 	protected function getFilterCollection($filter_type = self::WHERE_FILTER, $filter_scope = self::FLT_SYSTEM)
 	{
 		$filter_source = array(
 			self::WHERE_FILTER => 'WhereFilter',
 			self::HAVING_FILTER => 'HavingFilter',
 			self::AGGREGATE_FILTER => 'AggregateFilter'
 		);
 
 		/** @var kMultipleFilter[] $filters */
 		$property_name = $filter_source[$filter_type];
 		$filters =& $this->$property_name;
 
 		return $filters[$filter_scope];
 	}
 
 	/**
 	 * Clear all filters
 	 *
 	 * @access public
 	 */
 	public function clearFilters()
 	{
 		foreach ( $this->getFilterStructure() as $filter_params ) {
 			$property_name = $filter_params['type'];
 			$filter_group =& $this->$property_name;
 
 			$filter_group[$filter_params['class']]->clearFilters();
 		}
 	}
 
 	/**
 	* Counts the total number of records base on the query resulted from {@link kDBList::GetSelectSQL()}
 	*
 	* The method modifies the query to substitude SELECT part (fields listing) with COUNT(*).
 	* Special care should be applied when working with lists based on grouped queries, all aggregate function fields
 	* like SUM(), AVERAGE() etc. should be added to CountedSQL by using {@link kDBList::SetCountedSQL()}
 	*
 	* @access protected
 	*/
 	protected function CountRecs()
 	{
 		$all_sql = $this->GetSelectSQL(true,false);
 		$sql = $this->getCountSQL($all_sql);
 
 		$this->Counted = true;
 
 		if( $this->GetGroupClause() )
 		{
     		$this->RecordsCount = count( $this->Conn->GetCol($sql) );
 		}
 		else
 		{
 			$this->RecordsCount = (int)$this->Conn->GetOne($sql);
 		}
 
 	    $system_sql = $this->GetSelectSQL(true,true);
 	    if($system_sql == $all_sql) //no need to query the same again
 	    {
 	    	$this->NoFilterCount = $this->RecordsCount;
 	    	return;
 	    }
 
 		$sql = $this->getCountSQL($system_sql);
 		if( $this->GetGroupClause() )
 		{
 			$this->NoFilterCount = count( $this->Conn->GetCol($sql) );
 		}
 		else
 		{
 			$this->NoFilterCount = (int)$this->Conn->GetOne($sql);
 		}
 	}
 
 	/**
 	 * Returns record count in list with/without user filters applied
 	 *
 	 * @param bool $with_filters
 	 * @return int
 	 * @access public
 	 */
 	public function GetRecordsCount($with_filters = true)
 	{
 		if (!$this->Counted) {
 			$this->CountRecs();
 		}
 
 		return $with_filters ? $this->RecordsCount : $this->NoFilterCount;
 	}
 
 	/**
 	 * Returns record count, that were actually selected
 	 *
 	 * @return int
 	 * @access public
 	 */
 	public function GetSelectedCount()
 	{
 		$this->Query();
 
 		return $this->SelectedCount;
 	}
 
 	/**
 	 * Transforms given query into count query (DISTINCT is also processed)
 	 *
 	 * @param string $sql
 	 * @return string
 	 * @access public
 	 */
 	public function getCountSQL($sql)
 	{
 		if ( preg_match("/^\s*SELECT\s+DISTINCT(.*?\s)FROM(?!_)/is",$sql,$regs ) )
 		{
 			return preg_replace("/^\s*SELECT\s+DISTINCT(.*?\s)FROM(?!_)/is", "SELECT COUNT(DISTINCT ".$regs[1].") AS count FROM", $sql);
 		}
 		else
 		{
 			return preg_replace("/^\s*SELECT(.*?\s)FROM(?!_)/is", "SELECT COUNT(*) AS count FROM ", $sql);
 		}
 	}
 
 	/**
 	 * Queries the database with SQL resulted from {@link kDBList::GetSelectSQL()} and stores result in {@link kDBList::SelectRS}
 	 *
 	 * All the sorting, pagination, filtration of the list should be set prior to calling Query().
 	 *
 	 * @param bool $force force re-query, when already queried
 	 * @return bool
 	 * @access public
 	 */
 	public function Query($force=false)
 	{
 		if (!$force && $this->Queried) return true;
 		$q = $this->GetSelectSQL();
 
 		//$rs = $this->Conn->SelectLimit($q, $this->PerPage, $this->Offset);
 
 		//in case we have not counted records try to select one more item to find out if we have something more than perpage
 		$limit = $this->Counted ? $this->PerPage : $this->PerPage+1;
 
 		$sql = $q.' '.$this->Conn->getLimitClause($this->Offset,$limit);
 
 		$this->Records = $this->Conn->Query($sql);
 
 		if (!$this->Records && ($this->Page > 1)) {
 			if ( $this->Application->isAdmin ) {
 				// no records & page > 1, try to reset to 1st page (works only when list in not counted before)
 				$this->Application->StoreVar($this->getPrefixSpecial() . '_Page', 1, true);
 				$this->SetPage(1);
 				$this->Query($force);
 			}
 			else if ( $this->Application->HttpQuery->refererIsOurSite() ) {
 				// no records & page > 1, try to reset to last page
 				$this->SetPage($this->GetTotalPages());
 				$this->Query($force);
 			}
 			else {
 				// no records & page > 1, show 404 page
 				trigger_error('Unknown page <strong>' . $this->Page . '</strong> in <strong>' . $this->getPrefixSpecial() . '</strong> list, leading to "404 Not Found"', E_USER_NOTICE);
 				$this->Application->UrlManager->show404();
 			}
 		}
 
 		$this->SelectedCount = count($this->Records);
 		if (!$this->Counted) $this->RecordsCount = $this->SelectedCount;
 		if (!$this->Counted && $this->SelectedCount > $this->PerPage && $this->PerPage != -1) $this->SelectedCount--;
 
 		if ($this->Records === false) {
 			//handle errors here
 			return false;
 		}
 		$this->Queried = true;
 
 		$this->Application->HandleEvent(new kEvent($this->getPrefixSpecial() . ':OnAfterListQuery'));
 
 		return true;
 	}
 
 	/**
 	 * Adds one more record to list virtually and updates all counters
 	 *
 	 * @param Array $record
 	 * @access public
 	 */
 	public function addRecord($record)
 	{
 		$this->Records[] = $record;
 		$this->SelectedCount++;
 		$this->RecordsCount++;
 	}
 
 	/**
 	 * Calculates totals based on config
 	 *
 	 * @access protected
 	 */
 	protected function CalculateTotals()
 	{
 		$fields = Array ();
 		$this->Totals = Array ();
 
 		if ( $this->gridName ) {
 			$grid = $this->getUnitConfig()->getGridByName($this->gridName);
 			$grid_fields = $grid['Fields'];
 		}
 		else {
 			$grid_fields = $this->Fields;
 		}
 
 		foreach ($grid_fields as $field_name => $field_options) {
 			if ( $this->gridName && array_key_exists('totals', $field_options) && $field_options['totals'] ) {
 				$totals = $field_options['totals'];
 			}
 			elseif ( array_key_exists('totals', $this->Fields[$field_name]) && $this->Fields[$field_name]['totals'] ) {
 				$totals = $this->Fields[$field_name]['totals'];
 			}
 			else {
 				continue;
 			}
 
 			$calculated_field = array_key_exists($field_name, $this->CalculatedFields) && array_key_exists($field_name, $this->VirtualFields);
 			$db_field = !array_key_exists($field_name, $this->VirtualFields);
 
 			if ( $calculated_field || $db_field ) {
 				$field_expression = $calculated_field ? $this->CalculatedFields[$field_name] : '`' . $this->TableName . '`.`' . $field_name . '`';
 				$fields[$field_name] = $totals . '(' . $field_expression . ') AS ' . $field_name . '_' . $totals;
 			}
 		}
 
 		if ( !$fields ) {
 			return;
 		}
 
 		$sql = $this->GetSelectSQL(true, false);
 		$fields = str_replace('%1$s', $this->TableName, implode(', ', $fields));
 
 		if ( preg_match("/DISTINCT(.*?\s)FROM(?!_)/is", $sql, $regs) ) {
 			$sql = preg_replace("/^\s*SELECT DISTINCT(.*?\s)FROM(?!_)/is", 'SELECT ' . $fields . ' FROM', $sql);
 		}
 		else {
 			$sql = preg_replace("/^\s*SELECT(.*?\s)FROM(?!_)/is", 'SELECT ' . $fields . ' FROM ', $sql);
 		}
 
 		$totals = $this->Conn->Query($sql);
 
 		foreach ($totals as $totals_row) {
 			foreach ($totals_row as $total_field => $field_value) {
 				if ( !isset($this->Totals[$total_field]) ) {
 					$this->Totals[$total_field] = 0;
 				}
 				$this->Totals[$total_field] += $field_value;
 			}
 		}
 
 		$this->TotalsCalculated = true;
 	}
 
 	/**
 	 * Returns previously calculated total (not formatted)
 	 *
 	 * @param string $field
 	 * @param string $total_function
 	 * @return float
 	 * @access public
 	 */
 	public function getTotal($field, $total_function)
 	{
 		if (!$this->TotalsCalculated) {
 			$this->CalculateTotals();
 		}
 
 		return $this->Totals[$field . '_' . $total_function];
 	}
 
 	function setTotal($field, $total_function, $value)
 	{
 		$this->Totals[$field . '_' . $total_function] = $value;
 	}
 
 	function getTotalFunction($field)
 	{
 		if ( $this->gridName ) {
 			$grid = $this->getUnitConfig()->getGridByName($this->gridName);
 			$field_options = $grid['Fields'][$field];
 		}
 		else {
 			$field_options = $this->Fields[$field];
 		}
 
 		if ( $this->gridName && array_key_exists('totals', $field_options) && $field_options['totals'] ) {
 			return $field_options['totals'];
 		}
 		elseif ( array_key_exists('totals', $this->Fields[$field]) && $this->Fields[$field]['totals'] ) {
 			return $this->Fields[$field]['totals'];
 		}
 
 		return false;
 	}
 
 	/**
 	 * Returns previously calculated total (formatted)
 	 *
 	 * @param string $field
 	 * @param string $total_function
 	 * @return float
 	 * @access public
 	 */
 	function GetFormattedTotal($field, $total_function)
 	{
 		$res = $this->getTotal($field, $total_function);
 		$formatter_class = $this->GetFieldOption($field, 'formatter');
 
 		if ( $formatter_class ) {
+			/** @var kFormatter $formatter */
 			$formatter = $this->Application->recallObject($formatter_class);
-			/* @var $formatter kFormatter */
 
 			$res = $formatter->Format($res, $field, $this);
 		}
 
 		return $res;
 	}
 
 	/**
 	 * Builds full select query except for LIMIT clause
 	 *
 	 * @param bool $for_counting
 	 * @param bool $system_filters_only
 	 * @param string $keep_clause
 	 * @return string
 	 * @access public
 	 */
 	public function GetSelectSQL($for_counting = false, $system_filters_only = false, $keep_clause = '')
 	{
 		$q = parent::GetSelectSQL($this->SelectClause);
 		$q = !$for_counting ? $this->addCalculatedFields($q, 0) : str_replace('%2$s', '', $q);
 
 		$where = $this->GetWhereClause($for_counting,$system_filters_only);
 		$having = $this->GetHavingClause($for_counting,$system_filters_only);
 		$order = $this->GetOrderClause();
 		$group = $this->GetGroupClause();
 
 		if ( $for_counting ) {
 			$usage_string = $where . '|' . $having . '|' . $order . '|' . $group . '|' . $keep_clause;
 			$optimizer = new LeftJoinOptimizer($q, $this->replaceModePrefix( str_replace('%1$s', $this->TableName, $usage_string) ));
 			$q = $optimizer->simplify();
 		}
 
 		if (!empty($where)) $q .= ' WHERE ' . $where;
 		if (!empty($group)) $q .= ' GROUP BY ' . $group;
 		if (!empty($having)) $q .= ' HAVING ' . $having;
 		if ( !$for_counting && !empty($order) ) $q .= ' ORDER BY ' . $order;
 
 		return $this->replaceModePrefix( str_replace('%1$s', $this->TableName, $q) );
 	}
 
 	/**
 	 * Replaces all calculated field occurrences with their associated expressions
 	 *
 	 * @param string $clause where clause to extract calculated fields from
 	 * @param int $aggregated 0 - having + aggregated, 1 - having only, 2 - aggregated only
 	 * @param bool $replace_table
 	 * @return string
 	 * @access public
 	 */
 	public function extractCalculatedFields($clause, $aggregated = 1, $replace_table = false)
 	{
 		$fields = $this->getCalculatedFields($aggregated);
 
 		if ( is_array($fields) && count($fields) > 0 ) {
 			$fields = str_replace('%2$s', $this->Application->GetVar('m_lang'), $fields);
 
 			foreach ($fields as $field_name => $field_expression) {
 				$clause = preg_replace('/(\\(+)[(,` ]*' . $field_name . '[` ]{1}/', '\1 (' . $field_expression . ') ', $clause);
 				$clause = preg_replace('/[,` ]{1}' . $field_name . '[` ]{1}/', ' (' . $field_expression . ') ', $clause);
 			}
 		}
 
 		return $replace_table ? str_replace('%1$s', $this->TableName, $clause) : $clause;
 	}
 
 	/**
 	 * Returns WHERE clause of the query
 	 *
 	 * @param bool $for_counting merge where filters with having filters + replace field names for having fields with their values
 	 * @param bool $system_filters_only
 	 * @return string
 	 * @access private
 	 */
 	private function GetWhereClause($for_counting=false,$system_filters_only=false)
 	{
+		/** @var kMultipleFilter $where */
 		$where = $this->Application->makeClass('kMultipleFilter');
-		/* @var $where kMultipleFilter */
 
 		$where->addFilter(
 			'system_where',
 			$this->extractCalculatedFields($this->WhereFilter[self::FLT_SYSTEM]->getSQL())
 		);
 
 		if (!$system_filters_only) {
 			$where->addFilter('view_where', $this->WhereFilter[self::FLT_VIEW] );
 			$search_w = $this->WhereFilter[self::FLT_SEARCH]->getSQL();
 
 			if ($search_w || $for_counting) { // move search_having to search_where in case search_where isset or we are counting
 				$search_h = $this->extractCalculatedFields( $this->HavingFilter[self::FLT_SEARCH]->getSQL() );
 				$search_w = ($search_w && $search_h) ? $search_w.' OR '.$search_h : $search_w.$search_h;
 				$where->addFilter('search_where', $search_w );
 			}
 
 			// CUSTOM
 			$search_w = $this->WhereFilter[self::FLT_CUSTOM]->getSQL();
 
 			if ($search_w || $for_counting) { // move search_having to search_where in case search_where isset or we are counting
 				$search_h = $this->extractCalculatedFields( $this->HavingFilter[self::FLT_CUSTOM]->getSQL() );
 				$search_w = ($search_w && $search_h) ? $search_w.' AND '.$search_h : $search_w.$search_h;
 				$where->addFilter('custom_where', $search_w );
 			}
 			// CUSTOM
 		}
 
 		if( $for_counting ) // add system_having and view_having to where
 		{
 			$where->addFilter('system_having', $this->extractCalculatedFields($this->HavingFilter[kDBList::FLT_SYSTEM]->getSQL()) );
 			if (!$system_filters_only) $where->addFilter('view_having', $this->extractCalculatedFields( $this->HavingFilter[kDBList::FLT_VIEW]->getSQL() ) );
 		}
 
 		return $where->getSQL();
 	}
 
 	/**
 	* Returns HAVING clause of the query
 	*
 	* @param bool $for_counting don't return having filter in case if this is counting sql
 	* @param bool $system_filters_only return only system having filters
 	* @param int $aggregated 0 - aggregated and having, 1 - having only, 2 - aggregated only
 	* @return string
 	* @access private
 	*/
 	private function GetHavingClause($for_counting=false, $system_filters_only=false, $aggregated = 0)
 	{
 		if ($for_counting) {
+			/** @var kMultipleFilter $aggregate_filter */
 			$aggregate_filter = $this->Application->makeClass('kMultipleFilter');
-			/* @var $aggregate_filter kMultipleFilter */
 
 			$aggregate_filter->addFilter('aggregate_system', $this->AggregateFilter[kDBList::FLT_SYSTEM]);
 			if (!$system_filters_only) {
 				$aggregate_filter->addFilter('aggregate_view', $this->AggregateFilter[kDBList::FLT_VIEW]);
 			}
 			return $this->extractCalculatedFields($aggregate_filter->getSQL(), 2);
 		}
 
+		/** @var kMultipleFilter $having */
 		$having = $this->Application->makeClass('kMultipleFilter');
-		/* @var $having kMultipleFilter */
 
 		$having->addFilter('system_having', $this->HavingFilter[kDBList::FLT_SYSTEM] );
 		if ($aggregated == 0) {
 			if (!$system_filters_only) {
                 $having->addFilter('view_aggregated', $this->AggregateFilter[kDBList::FLT_VIEW] );
             }
             $having->addFilter('system_aggregated', $this->AggregateFilter[kDBList::FLT_SYSTEM]);
 		}
 
 		if (!$system_filters_only) {
 			$having->addFilter('view_having', $this->HavingFilter[kDBList::FLT_VIEW] );
 			$having->addFilter('custom_having', $this->HavingFilter[kDBList::FLT_CUSTOM] );
 			$search_w = $this->WhereFilter[kDBList::FLT_SEARCH]->getSQL();
 			if (!$search_w) {
 				$having->addFilter('search_having', $this->HavingFilter[kDBList::FLT_SEARCH] );
 			}
 		}
 
 		return $having->getSQL();
 	}
 
 	/**
 	* Returns GROUP BY clause of the query
 	*
 	* @return string
 	* @access protected
 	*/
 	protected function GetGroupClause()
 	{
 		return $this->GroupByFields ? implode(',', $this->GroupByFields) : '';
 	}
 
 	/**
 	 * Adds new group by field
 	 *
 	 * @param string $field
 	 * @access public
 	 */
 	public function AddGroupByField($field)
 	{
 		$this->GroupByFields[$field] = $field;
 	}
 
 	/**
 	 * Removes group by field added before
 	 *
 	 * @param string $field
 	 * @access public
 	 */
 	public function RemoveGroupByField($field)
 	{
 		unset($this->GroupByFields[$field]);
 	}
 
 	/**
 	 * Adds order field to ORDER BY clause
 	 *
 	 * @param string $field Field name
 	 * @param string $direction Direction of ordering (asc|desc)
 	 * @param bool $is_expression this is expression, that should not be escapted by "`" symbols
 	 * @return int
 	 * @access public
 	 */
 	public function AddOrderField($field, $direction = 'asc', $is_expression = false)
 	{
 		// original multilanguage field - convert to current lang field
 		$formatter = isset($this->Fields[$field]['formatter']) ? $this->Fields[$field]['formatter'] : false;
 
 		if ($formatter == 'kMultiLanguage' && !isset($this->Fields[$field]['master_field'])) {
 			// for now kMultiLanguage formatter is only supported for real (non-virtual) fields
 			$is_expression = true;
 			$field = $this->getMLSortField($field);
 		}
 
 		if (!isset($this->Fields[$field]) && $field != 'RAND()' && !$is_expression) {
 			trigger_error('<span class="debug_error">Incorrect sorting</span> defined (field = <b>'.$field.'</b>; direction = <b>'.$direction.'</b>) in config for prefix <b>'.$this->Prefix.'</b>', E_USER_NOTICE);
 		}
 
 		$this->OrderFields[] = Array($field, $direction, $is_expression);
 
 		return count($this->OrderFields) - 1;
 	}
 
 	/**
 	 * Sets new order fields, replacing existing ones
 	 *
 	 * @param Array $order_fields
 	 * @return void
 	 * @access public
 	 */
 	public function setOrderFields($order_fields)
 	{
 		$this->OrderFields = $order_fields;
 	}
 
 	/**
 	 * Changes sorting direction for a given sorting field index
 	 *
 	 * @param int $field_index
 	 * @param string $direction
 	 * @return void
 	 * @access public
 	 */
 	public function changeOrderDirection($field_index, $direction)
 	{
 		if ( !isset($this->OrderFields[$field_index]) ) {
 			return;
 		}
 
 		$this->OrderFields[$field_index][1] = $direction;
 	}
 
 	/**
 	 * Returns expression, used to sort given multilingual field
 	 *
 	 * @param string $field
 	 * @return string
 	 */
 	function getMLSortField($field)
 	{
 		$table_name = '`' . $this->TableName . '`';
 		$lang = $this->Application->GetVar('m_lang');
 		$primary_lang = $this->Application->GetDefaultLanguageId();
 
 		$ret = 'IF(COALESCE(%1$s.l' . $lang . '_' . $field . ', ""), %1$s.l' . $lang . '_' . $field . ', %1$s.l' . $primary_lang . '_' . $field . ')';
 
 		return sprintf($ret, $table_name);
 	}
 
 	/**
 	* Removes all order fields
 	*
 	* @access public
 	*/
 	public function ClearOrderFields()
 	{
 		$this->OrderFields = Array();
 	}
 
 	/**
 	* Returns ORDER BY Clause of the query
 	*
 	*	The method builds order by clause by iterating {@link kDBList::OrderFields} array and concatenating it.
 	*
 	* @return string
 	* @access private
 	*/
 	private function GetOrderClause()
 	{
 		$ret = '';
 		foreach ($this->OrderFields as $field) {
 
 			$name = $field[0];
 			$ret .= isset($this->Fields[$name]) && !isset($this->VirtualFields[$name]) ? '`'.$this->TableName.'`.' : '';
 
 			if ($field[0] == 'RAND()' || $field[2]) {
 				$ret .= $field[0].' '.$field[1].',';
 			}
 			else {
 				$ret .= (strpos($field[0], '.') === false ? '`'.$field[0] . '`' : $field[0]) . ' ' . $field[1] . ',';
 			}
 		}
 		$ret = rtrim($ret, ',');
 		return $ret;
 	}
 
 	/**
 	 * Returns order field name in given position
 	 *
 	 * @param int $pos
 	 * @param bool $no_default
 	 * @return string
 	 * @access public
 	 */
 	public function GetOrderField($pos = NULL, $no_default = false)
 	{
 		if ( !(isset($this->OrderFields[$pos]) && $this->OrderFields[$pos]) && !$no_default ) {
 			$pos = 0;
 		}
 
 		if ( isset($this->OrderFields[$pos][0]) ) {
 			$field = $this->OrderFields[$pos][0];
 			$lang = $this->Application->GetVar('m_lang');
 
 			if ( preg_match('/^IF\(COALESCE\(.*?\.(l' . $lang . '_.*?), ""\),/', $field, $regs) ) {
 				// undo result of kDBList::getMLSortField method
 				return $regs[1];
 			}
 
 			return $field;
 		}
 
 		return '';
 	}
 
 	/**
 	 * Returns list order fields
 	 *
 	 * @return Array
 	 * @access public
 	 */
 	public function getOrderFields()
 	{
 		return $this->OrderFields;
 	}
 
 	/**
 	 * Returns order field direction in given position
 	 *
 	 * @param int $pos
 	 * @param bool $no_default
 	 * @return string
 	 * @access public
 	 */
 	public function GetOrderDirection($pos = NULL, $no_default = false)
 	{
 		if ( !(isset($this->OrderFields[$pos]) && $this->OrderFields[$pos]) && !$no_default ) {
 			$pos = 0;
 		}
 
 		return isset($this->OrderFields[$pos][1]) ? $this->OrderFields[$pos][1] : '';
 	}
 
 	/**
 	 * Returns ID of currently processed record
 	 *
 	 * @return int
 	 * @access public
 	 */
 	public function GetID()
 	{
 		return $this->Queried ? $this->GetDBField($this->IDField) : null;
 	}
 
 	/**
 	 * Allows kDBTagProcessor.SectionTitle to detect if it's editing or new item creation
 	 *
 	 * @return bool
 	 * @access public
 	 */
 	public function IsNewItem()
 	{
 		// no such thing as NewItem for lists :)
 		return false;
 	}
 
 	/**
 	 * Return unformatted field value
 	 *
 	 * @param string $name
 	 * @return string
 	 * @access public
 	 */
 	public function GetDBField($name)
 	{
 		$row =& $this->getCurrentRecord();
 
 		if (defined('DEBUG_MODE') && DEBUG_MODE && $this->Queried && !array_key_exists($name, $row)) {
 			if ( $this->Application->isDebugMode() ) {
 				$this->Application->Debugger->appendTrace();
 			}
 
 			trigger_error('Field "<strong>' . $name . '</strong>" doesn\'t exist in prefix <strong>' . $this->getPrefixSpecial() . '</strong>', E_USER_WARNING);
 			return 'NO SUCH FIELD';
 		}
 
 		// return "null" for missing fields, because formatter require such behaviour !
 		return array_key_exists($name, $row) ? $row[$name] : null;
 	}
 
 	/**
 	 * Checks if requested field is present after database query
 	 *
 	 * @param string $name
 	 * @return bool
 	 * @access public
 	 */
 	public function HasField($name)
 	{
 		$row =& $this->getCurrentRecord();
 		return isset($row[$name]);
 	}
 
 	/**
 	 * Returns current record fields
 	 *
 	 * @return Array
 	 * @access public
 	 */
 	public function GetFieldValues()
 	{
 		$record =& $this->getCurrentRecord();
 
 		return $record;
 	}
 
 	/**
 	 * Returns current record from list
 	 *
 	 * @param int $offset Offset relative to current record index
 	 * @return Array
 	 * @access public
 	 */
 	public function &getCurrentRecord($offset = 0)
 	{
 		$record_index = $this->CurrentIndex + $offset;
 
 		if ($record_index >=0 && $record_index < $this->SelectedCount) {
 			return $this->Records[$record_index];
 		}
 
 		$false = false;
 		return $false;
 	}
 
 	/**
 	 * Goes to record with given index
 	 *
 	 * @param int $index
 	 * @access public
 	 */
 	public function GoIndex($index)
 	{
 		$this->CurrentIndex = $index;
 	}
 
 	/**
 	* Goes to first record
 	*
 	* @access public
 	*/
 	public function GoFirst()
 	{
 		$this->CurrentIndex = 0;
 	}
 
 	/**
 	* Goes to next record
 	*
 	* @access public
 	*/
 	public function GoNext()
 	{
 		$this->CurrentIndex++;
 	}
 
 	/**
 	* Goes to previous record
 	*
 	* @access public
 	*/
 	public function GoPrev()
 	{
 		if ($this->CurrentIndex>0) {
 			$this->CurrentIndex--;
 		}
 	}
 
 	/**
 	* Checks if there is no end of list
 	*
 	* @return bool
 	* @access public
 	*/
 	public function EOL()
 	{
 		return ($this->CurrentIndex >= $this->SelectedCount);
 	}
 
 	/**
 	 * Returns total page count based on list per-page
 	 *
 	 * @return int
 	 * @access public
 	 */
 	public function GetTotalPages()
 	{
 		if ( !$this->Counted ) {
 			$this->CountRecs();
 		}
 
 		if ( $this->PerPage == -1 ) {
 			return 1;
 		}
 
 		$integer_part = ($this->RecordsCount - ($this->RecordsCount % $this->PerPage)) / $this->PerPage;
 		$reminder = ($this->RecordsCount % $this->PerPage) != 0; // adds 1 if there is a reminder
 
 		$this->TotalPages = $integer_part + $reminder;
 
 		return $this->TotalPages;
 	}
 
 	/**
 	* Sets number of records to query per page
 	*
 	* @param int $per_page Number of records to display per page
 	* @access public
 	*/
 	public function SetPerPage($per_page)
 	{
 		$this->PerPage = $per_page;
 	}
 
 	/**
 	 * Returns records per page count
 	 *
 	 * @param bool $in_fact
 	 * @return int
 	 * @access public
 	 */
 	public function GetPerPage($in_fact = false)
 	{
 		if ($in_fact) {
 			return $this->PerPage;
 		}
 
 		return $this->PerPage == -1 ? $this->RecordsCount : $this->PerPage;
 	}
 
 	/**
 	* Sets current page in list
 	*
 	* @param int $page
 	* @access public
 	*/
 	public function SetPage($page)
 	{
 		if ($this->PerPage == -1) {
 			$this->Page = 1;
 			return;
 		}
 		if ($page < 1) $page = 1;
 		$this->Offset = ($page-1)*$this->PerPage;
 		if ($this->Counted && $this->Offset > $this->RecordsCount) {
 			$this->SetPage(1);
 		}
 		else {
 			$this->Page = $page;
 		}
 		//$this->GoFirst();
 	}
 
 	/**
 	 * Returns current list page
 	 *
 	 * @return int
 	 * @access public
 	 */
 	public function GetPage()
 	{
 		return $this->Page;
 	}
 
 	/**
 	 * Sets list query offset
 	 *
 	 * @param int $offset
 	 * @access public
 	 */
 	public function SetOffset($offset)
 	{
 		$this->Offset = $offset;
 	}
 
 	/**
 	 * Gets list query offset
 	 *
 	 * @return int
 	 * @access public
 	 */
 	public function GetOffset()
 	{
 		return $this->Offset;
 	}
 
 	/**
 	* Sets current item field value (doesn't apply formatting)
 	*
 	* @param string $name Name of the field
 	* @param mixed $value Value to set the field to
 	* @access public
 	*/
 	public function SetDBField($name,$value)
 	{
 		$this->Records[$this->CurrentIndex][$name] = $value;
 	}
 
 	/**
 	 * Apply where clause, that links this object to it's parent item
 	 *
 	 * @param string $special
 	 * @access public
 	 */
 	public function linkToParent($special)
 	{
 		$config = $this->getUnitConfig();
 		$parent_prefix = $config->getParentPrefix();
 
 		if ( $parent_prefix ) {
 			$parent_table_key = $config->getParentTableKey($parent_prefix);
 			$foreign_key_field = $config->getForeignKey($parent_prefix);
 
 			if ( !$parent_table_key || !$foreign_key_field ) {
 				return;
 			}
 
+			/** @var kDBItem $parent_object */
 			$parent_object = $this->Application->recallObject($parent_prefix . '.' . $special);
-			/* @var $parent_object kDBItem */
 
 			if ( !$parent_object->isLoaded() ) {
 				$this->addFilter('parent_filter', 'FALSE');
 				trigger_error('Parent ID not found (prefix: "<strong>' . rtrim($parent_prefix . '.' . $special, '.') . '</strong>"; sub-prefix: "<strong>' . $this->getPrefixSpecial() . '</strong>")', E_USER_NOTICE);
 
 				return;
 			}
 
 			// only for list in this case
 			$parent_id = $parent_object->GetDBField($parent_table_key);
 			$this->addFilter('parent_filter', '`' . $this->TableName . '`.`' . $foreign_key_field . '` = ' . $this->Conn->qstr($parent_id));
 		}
 	}
 
 	/**
 	 * Returns true if list was queried (same name as for kDBItem for easy usage)
 	 *
 	 * @return bool
 	 * @access public
 	 */
 	public function isLoaded()
 	{
 		return $this->Queried && !$this->EOL();
 	}
 
 	/**
 	 * Returns specified field value from all selected rows.
 	 * Don't affect current record index
 	 *
 	 * @param string $field
 	 * @param bool $formatted
 	 * @param string $format
 	 * @return Array
 	 * @access public
 	 */
 	public function GetCol($field, $formatted = false, $format = null)
 	{
 		$i = 0;
 		$ret = Array ();
 
 		if ($formatted && array_key_exists('formatter', $this->Fields[$field])) {
+			/** @var kFormatter $formatter */
 			$formatter = $this->Application->recallObject($this->Fields[$field]['formatter']);
-			/* @var $formatter kFormatter */
 
 			while ($i < $this->SelectedCount) {
 				$ret[] = $formatter->Format($this->Records[$i][$field], $field, $this, $format);
 				$i++;
 			}
 		}
 		else {
 			while ($i < $this->SelectedCount) {
 				$ret[] = $this->Records[$i][$field];
 				$i++;
 			}
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Set's field error, if pseudo passed not found then create it with message text supplied.
 	 * Don't overwrite existing pseudo translation.
 	 *
 	 * @param string $field
 	 * @param string $pseudo
 	 * @param string $error_label
 	 * @param Array $error_params
 	 * @return bool
 	 * @access public
 	 * @see kSearchHelper::processRangeField()
 	 * @see kDateFormatter::Parse()
 	 */
 	public function SetError($field, $pseudo, $error_label = null, $error_params = null)
 	{
 		$error_field = isset($this->Fields[$field]['error_field']) ? $this->Fields[$field]['error_field'] : $field;
 		$this->FieldErrors[$error_field]['pseudo'] = $pseudo;
 
 		$var_name = $this->getPrefixSpecial() . '_' . $field . '_error';
 		$previous_pseudo = $this->Application->RecallVar($var_name);
 
 		if ( $previous_pseudo ) {
 			// don't set more then one error on field
 			return false;
 		}
 
 		$this->Application->StoreVar($var_name, $pseudo);
 
 		return true;
 	}
 
 	/**
 	 * Returns error pseudo
 	 *
 	 * @param string $field
 	 * @return string
 	 * @access public
 	 * @see kSearchHelper::processRangeField()
 	 */
 	public function GetErrorPseudo($field)
 	{
 		if ( !isset($this->FieldErrors[$field]) ) {
 			return '';
 		}
 
 		return isset($this->FieldErrors[$field]['pseudo']) ? $this->FieldErrors[$field]['pseudo'] : '';
 	}
 
 	/**
 	 * Removes error on field
 	 *
 	 * @param string $field
 	 * @access public
 	 */
 	public function RemoveError($field)
 	{
 		unset( $this->FieldErrors[$field] );
 	}
 
 	/**
 	 * Group list records by header, saves internal order in group
 	 *
 	 * @param string $heading_field
 	 * @access public
 	 */
 	public function groupRecords($heading_field)
 	{
 		$i = 0;
 		$sorted = Array ();
 
 		while ($i < $this->SelectedCount) {
 			$sorted[ $this->Records[$i][$heading_field] ][] = $this->Records[$i];
 			$i++;
 		}
 
 		$this->Records = Array ();
 
 		foreach ($sorted as $heading => $heading_records) {
 			$this->Records = array_merge_recursive($this->Records, $heading_records);
 		}
 	}
 
 	/**
 	 * Reset list (use for requering purposes)
 	 *
 	 * @access public
 	 */
 	public function reset()
 	{
 		$this->Counted = false;
 		$this->clearFilters();
 		$this->ClearOrderFields();
 	}
 
 	/**
 	 * Checks if list was counted
 	 *
 	 * @return bool
 	 * @access public
 	 */
 	public function isCounted()
 	{
 		return $this->Counted;
 	}
 
 	/**
 	 * Tells, that given list is main
 	 *
 	 * @return bool
 	 * @access public
 	 */
 	public function isMainList()
 	{
 		return $this->mainList;
 	}
 
 	/**
 	 * Makes given list as main
 	 *
 	 * @access public
 	 */
 	public function becameMain()
 	{
 		$this->mainList = true;
 	}
 
 	/**
 	 * Moves recordset pointer to first element
 	 *
 	 * @return void
 	 * @access public
 	 * @implements Iterator::rewind
 	 */
 	public function rewind()
 	{
 		$this->Query();
 		$this->GoFirst();
 	}
 
 	/**
 	 * Returns value at current position
 	 *
 	 * @return mixed
 	 * @access public
 	 * @implements Iterator::current
 	 */
 	function current()
 	{
 		return $this->getCurrentRecord();
 	}
 
 	/**
 	 * Returns key at current position
 	 *
 	 * @return mixed
 	 * @access public
 	 * @implements Iterator::key
 	 */
 	function key()
 	{
 		return $this->CurrentIndex;
 	}
 
 	/**
 	 * Moves recordset pointer to next position
 	 *
 	 * @return void
 	 * @access public
 	 * @implements Iterator::next
 	 */
 	function next()
 	{
 		$this->GoNext();
 	}
 
 	/**
 	 * Detects if current position is within recordset bounds
 	 *
 	 * @return bool
 	 * @access public
 	 * @implements Iterator::valid
 	 */
 	public function valid()
 	{
 		return !$this->EOL();
 	}
 
 	/**
 	 * Counts recordset rows
 	 *
 	 * @return int
 	 * @access public
 	 * @implements Countable::count
 	 */
 	public function count()
 	{
 		return $this->SelectedCount;
 	}
 }
 
 
 class LeftJoinOptimizer {
 
 	/**
 	 * Input sql for optimization
 	 *
 	 * @var string
 	 * @access private
 	 */
 	private $sql = '';
 
 	/**
 	 * All sql parts, where LEFT JOINed table aliases could be used
 	 *
 	 * @var string
 	 * @access private
 	 */
 	private $usageString = '';
 
 	/**
 	 * List of discovered LEFT JOINs
 	 *
 	 * @var Array
 	 * @access private
 	 */
 	private $joins = Array ();
 
 	/**
 	 * LEFT JOIN relations
 	 *
 	 * @var Array
 	 * @access private
 	 */
 	private $joinRelations = Array ();
 
 	/**
 	 * LEFT JOIN table aliases scheduled for removal
 	 *
 	 * @var Array
 	 * @access private
 	 */
 	private $aliasesToRemove = Array ();
 
 	/**
 	 * Creates new instance of the class
 	 *
 	 * @param string $sql
 	 * @param string $usage_string
 	 */
 	public function __construct($sql, $usage_string)
 	{
 		$this->sql = $sql;
 		$this->usageString = $usage_string;
 
 		$this->parseJoins();
 	}
 
 	/**
 	 * Tries to remove unused LEFT JOINs
 	 *
 	 * @return string
 	 * @access public
 	 */
 	public function simplify()
 	{
 		if ( !$this->joins ) {
 			// no LEFT JOIN used, return unchanged sql
 			return $this->sql;
 		}
 
 		$this->updateRelations();
 		$this->removeAliases();
 
 		return $this->sql;
 	}
 
 	/**
 	 * Discovers LEFT JOINs based on given sql
 	 *
 	 * @return void
 	 * @access private
 	 */
 	private function parseJoins()
 	{
 		if ( !preg_match_all('/LEFT\s+JOIN\s+(.*?|.*?\s+AS\s+.*?|.*?\s+.*?)\s+ON\s+(.*?\n|.*?$)/si', $this->sql, $regs) ) {
 			$this->joins = Array ();
 		}
 
 		// get all LEFT JOIN clause info from sql (without filters)
 		foreach ($regs[1] as $index => $match) {
 			$match_parts = preg_split('/\s+AS\s+|\s+/i', $match, 2);
 			$table_alias = count($match_parts) == 1 ? $match : $match_parts[1];
 
 			$this->joins[$table_alias] = Array (
 				'table' => $match_parts[0],
 				'join_clause' => $regs[0][$index],
 			);
 		}
 	}
 
 	/**
 	 * Detects relations between LEFT JOINs
 	 *
 	 * @return void
 	 * @access private
 	 */
 	private function updateRelations()
 	{
 		foreach ($this->joins as $table_alias => $left_join_info) {
 			$escaped_alias = preg_quote($table_alias, '/');
 
 			foreach ($this->joins as $sub_table_alias => $sub_left_join_info) {
 				if ($table_alias == $sub_table_alias) {
 					continue;
 				}
 
 				if ( $this->matchAlias($escaped_alias, $sub_left_join_info['join_clause']) ) {
 					$this->joinRelations[] = $sub_table_alias . ':' . $table_alias;
 				}
 			}
 		}
 	}
 
 	/**
 	 * Removes scheduled LEFT JOINs, but only if they are not protected
 	 *
 	 * @return void
 	 * @access private
 	 */
 	private function removeAliases()
 	{
 		$this->prepareAliasesRemoval();
 
 		foreach ($this->aliasesToRemove as $to_remove_alias) {
 			if ( !$this->aliasProtected($to_remove_alias) ) {
 				$this->sql = str_replace($this->joins[$to_remove_alias]['join_clause'], '', $this->sql);
 			}
 		}
 	}
 
 	/**
 	 * Schedules unused LEFT JOINs to for removal
 	 *
 	 * @return void
 	 * @access private
 	 */
 	private function prepareAliasesRemoval()
 	{
 		foreach ($this->joins as $table_alias => $left_join_info) {
 			$escaped_alias = preg_quote($table_alias, '/');
 
 			if ( !$this->matchAlias($escaped_alias, $this->usageString) ) {
 				$this->aliasesToRemove[] = $table_alias;
 			}
 		}
 	}
 
 	/**
 	 * Checks if someone wants to remove LEFT JOIN, but it's used by some other LEFT JOIN, that stays
 	 *
 	 * @param string $table_alias
 	 * @return bool
 	 * @access private
 	 */
 	private function aliasProtected($table_alias)
 	{
 		foreach ($this->joinRelations as $relation) {
 			list ($main_alias, $used_alias) = explode(':', $relation);
 
 			if ( ($used_alias == $table_alias) && !in_array($main_alias, $this->aliasesToRemove) ) {
 				return true;
 			}
 		}
 
 		return false;
 	}
 
 	/**
 	 * Matches given escaped alias to a string
 	 *
 	 * @param string $escaped_alias
 	 * @param string $string
 	 * @return bool
 	 * @access private
 	 */
 	private function matchAlias($escaped_alias, $string)
 	{
 		return preg_match('/(`' . $escaped_alias . '`|' . $escaped_alias . ')\./', $string);
 	}
 }
Index: branches/5.3.x/core/kernel/db/db_event_handler.php
===================================================================
--- branches/5.3.x/core/kernel/db/db_event_handler.php	(revision 16518)
+++ branches/5.3.x/core/kernel/db/db_event_handler.php	(revision 16519)
@@ -1,3453 +1,3455 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	define('EH_CUSTOM_PROCESSING_BEFORE',1);
 	define('EH_CUSTOM_PROCESSING_AFTER',2);
 
 	/**
 	 * Note:
 	 *   1. When addressing variables from submit containing
 	 *	 	Prefix_Special as part of their name use
 	 *	 	$event->getPrefixSpecial(true) instead of
 	 *	 	$event->getPrefixSpecial() as usual. This is due PHP
 	 *	 	is converting "." symbols in variable names during
 	 *	 	submit info "_". $event->getPrefixSpecial optional
 	 *	 	1st parameter returns correct current Prefix_Special
 	 *	 	for variables being submitted such way (e.g. variable
 	 *	 	name that will be converted by PHP: "users.read_only_id"
 	 *	 	will be submitted as "users_read_only_id".
 	 *
 	 *	 2.	When using $this->Application-LinkVar on variables submitted
 	 *		from form which contain $Prefix_Special then note 1st item. Example:
 	 *		LinkVar($event->getPrefixSpecial(true).'_varname',$event->getPrefixSpecial().'_varname')
 	 *
 	 */
 
 	/**
 	 * EventHandler that is used to process
 	 * any database related events
 	 *
 	 */
 	class kDBEventHandler extends kEventHandler {
 
 		/**
 		 * Checks permissions of user
 		 *
 		 * @param kEvent $event
 		 * @return bool
 		 * @access public
 		 */
 		public function CheckPermission(kEvent $event)
 		{
 			$section = $event->getSection();
 
 			if ( !$this->Application->isAdmin ) {
 				$allow_events = Array ('OnSearch', 'OnSearchReset', 'OnNew');
 				if ( in_array($event->Name, $allow_events) ) {
 					// allow search on front
 					return true;
 				}
 			}
 			elseif ( ($event->Name == 'OnPreSaveAndChangeLanguage') && !$this->UseTempTables($event) ) {
 				// allow changing language in grids, when not in editing mode
 				return $this->Application->CheckPermission($section . '.view', 1);
 			}
 
 			if ( !preg_match('/^CATEGORY:(.*)/', $section) ) {
 				// only if not category item events
 				if ( (substr($event->Name, 0, 9) == 'OnPreSave') || ($event->Name == 'OnSave') ) {
 					if ( $this->isNewItemCreate($event) ) {
 						return $this->Application->CheckPermission($section . '.add', 1);
 					}
 					else {
 						return $this->Application->CheckPermission($section . '.add', 1) || $this->Application->CheckPermission($section . '.edit', 1);
 					}
 				}
 			}
 
 			if ( $event->Name == 'OnPreCreate' ) {
 				// save category_id before item create (for item category selector not to destroy permission checking category)
 				$this->Application->LinkVar('m_cat_id');
 			}
 
 			return parent::CheckPermission($event);
 		}
 
 		/**
 		 * Allows to override standard permission mapping
 		 *
 		 * @return void
 		 * @access protected
 		 * @see kEventHandler::$permMapping
 		 */
 		protected function mapPermissions()
 		{
 			parent::mapPermissions();
 
 			$permissions = Array (
 				'OnLoad' => Array ('self' => 'view', 'subitem' => 'view'),
 				'OnItemBuild' => Array ('self' => 'view', 'subitem' => 'view'),
 				'OnSuggestValues' => Array ('self' => 'admin', 'subitem' => 'admin'),
 				'OnSuggestValuesJSON' => Array ('self' => 'admin', 'subitem' => 'admin'),
 
 				'OnBuild' => Array ('self' => true),
 
 				'OnNew' => Array ('self' => 'add', 'subitem' => 'add|edit'),
 				'OnCreate' => Array ('self' => 'add', 'subitem' => 'add|edit'),
 				'OnUpdate' => Array ('self' => 'edit', 'subitem' => 'add|edit'),
 				'OnSetPrimary' => Array ('self' => 'add|edit', 'subitem' => 'add|edit'),
 				'OnDelete' => Array ('self' => 'delete', 'subitem' => 'add|edit'),
 				'OnDeleteAll' => Array ('self' => 'delete', 'subitem' => 'add|edit'),
 				'OnMassDelete' => Array ('self' => 'delete', 'subitem' => 'add|edit'),
 				'OnMassClone' => Array ('self' => 'add', 'subitem' => 'add|edit'),
 
 				'OnCut' => Array ('self'=>'edit', 'subitem' => 'edit'),
 				'OnCopy' => Array ('self'=>'edit', 'subitem' => 'edit'),
 				'OnPaste' => Array ('self'=>'edit', 'subitem' => 'edit'),
 
 				'OnSelectItems' => Array ('self' => 'add|edit', 'subitem' => 'add|edit'),
 				'OnProcessSelected' => Array ('self' => 'add|edit', 'subitem' => 'add|edit'),
 				'OnStoreSelected' => Array ('self' => 'add|edit', 'subitem' => 'add|edit'),
 				'OnSelectUser' => Array ('self' => 'add|edit', 'subitem' => 'add|edit'),
 
 				'OnMassApprove' => Array ('self' => 'advanced:approve|edit', 'subitem' => 'advanced:approve|add|edit'),
 				'OnMassDecline' => Array ('self' => 'advanced:decline|edit', 'subitem' => 'advanced:decline|add|edit'),
 				'OnMassMoveUp' => Array ('self' => 'advanced:move_up|edit', 'subitem' => 'advanced:move_up|add|edit'),
 				'OnMassMoveDown' => Array ('self' => 'advanced:move_down|edit', 'subitem' => 'advanced:move_down|add|edit'),
 
 				'OnPreCreate' => Array ('self' => 'add|add.pending', 'subitem' => 'edit|edit.pending'),
 				'OnEdit' => Array ('self' => 'edit|edit.pending', 'subitem' => 'edit|edit.pending'),
 
 				'OnExport' => Array ('self' => 'view|advanced:export'),
 				'OnExportBegin' => Array ('self' => 'view|advanced:export'),
 				'OnExportProgress' => Array ('self' => 'view|advanced:export'),
 
 				'OnSetAutoRefreshInterval' => Array ('self' => true, 'subitem' => true),
 				'OnAutoRefreshToggle' => Array ('self' => true, 'subitem' => true),
 
 				// theese event do not harm, but just in case check them too :)
 				'OnCancelEdit' => Array ('self' => true, 'subitem' => true),
 				'OnCancel' => Array ('self' => true, 'subitem' => true),
 				'OnReset' => Array ('self' => true, 'subitem' => true),
 
 				'OnSetSorting' => Array ('self' => true, 'subitem' => true),
 				'OnSetSortingDirect' => Array ('self' => true, 'subitem' => true),
 				'OnResetSorting' => Array ('self' => true, 'subitem' => true),
 
 				'OnSetFilter' => Array ('self' => true, 'subitem' => true),
 				'OnApplyFilters' => Array ('self' => true, 'subitem' => true),
 				'OnRemoveFilters' => Array ('self' => true, 'subitem' => true),
 				'OnSetFilterPattern' => Array ('self' => true, 'subitem' => true),
 
 				'OnSetPerPage' => Array ('self' => true, 'subitem' => true),
 				'OnSetPage' => Array ('self' => true, 'subitem' => true),
 
 				'OnSearch' => Array ('self' => true, 'subitem' => true),
 				'OnSearchReset' => Array ('self' => true, 'subitem' => true),
 
 				'OnGoBack' => Array ('self' => true, 'subitem' => true),
 
 				// it checks permission itself since flash uploader does not send cookies
 				'OnUploadFile' => Array ('self' => true, 'subitem' => true),
 				'OnDeleteFile' => Array ('self' => true, 'subitem' => true),
 
 				'OnViewFile' => Array ('self' => true, 'subitem' => true),
 				'OnSaveWidths' => Array ('self' => 'admin', 'subitem' => 'admin'),
 
 				'OnValidateMInputFields' => Array ('self' => 'view'),
 				'OnValidateField' => Array ('self' => true, 'subitem' => true),
 			);
 
 			$this->permMapping = array_merge($this->permMapping, $permissions);
 		}
 
 		/**
 		 * Define alternative event processing method names
 		 *
 		 * @return void
 		 * @see kEventHandler::$eventMethods
 		 * @access protected
 		 */
 		protected function mapEvents()
 		{
 			$events_map = Array (
 				'OnRemoveFilters' => 'FilterAction',
 				'OnApplyFilters' => 'FilterAction',
 				'OnMassApprove' => 'iterateItems',
 				'OnMassDecline' => 'iterateItems',
 				'OnMassMoveUp' => 'iterateItems',
 				'OnMassMoveDown' => 'iterateItems',
 			);
 
 			$this->eventMethods = array_merge($this->eventMethods, $events_map);
 		}
 
 		/**
 		 * Returns ID of current item to be edited
 		 * by checking ID passed in get/post as prefix_id
 		 * or by looking at first from selected ids, stored.
 		 * Returned id is also stored in Session in case
 		 * it was explicitly passed as get/post
 		 *
 		 * @param kEvent $event
 		 * @return int
 		 * @access public
 		 */
 		public function getPassedID(kEvent $event)
 		{
 			if ( $event->getEventParam('raise_warnings') === false ) {
 				$event->setEventParam('raise_warnings', 1);
 			}
 
 			if ( $event->Special == 'previous' || $event->Special == 'next' ) {
+				/** @var kDBItem $object */
 				$object = $this->Application->recallObject($event->getEventParam('item'));
-				/* @var $object kDBItem */
 
+				/** @var ListHelper $list_helper */
 				$list_helper = $this->Application->recallObject('ListHelper');
-				/* @var $list_helper ListHelper */
 
 				$select_clause = $object->getUnitConfig()->getNavigationSelectClause(NULL);
 
 				return $list_helper->getNavigationResource($object, $event->getEventParam('list'), $event->Special == 'next', $select_clause);
 			}
 			elseif ( $event->Special == 'filter' ) {
 				// temporary object, used to print filter options only
 				return 0;
 			}
 
 			if ( preg_match('/^auto-(.*)/', $event->Special, $regs) && $this->Application->prefixRegistred($regs[1]) ) {
 				// <inp2:lang.auto-phrase_Field name="DateFormat"/> - returns field DateFormat value from language (LanguageId is extracted from current phrase object)
+				/** @var kDBItem $main_object */
 				$main_object = $this->Application->recallObject($regs[1]);
-				/* @var $main_object kDBItem */
 
 				return $main_object->GetDBField($event->getUnitConfig()->getIDField());
 			}
 
 			// 1. get id from post (used in admin)
 			$ret = $this->Application->GetVar($event->getPrefixSpecial(true) . '_id');
 			if ( ($ret !== false) && ($ret != '') ) {
 				$event->setEventParam(kEvent::FLAG_ID_FROM_REQUEST, true);
 
 				return $ret;
 			}
 
 			// 2. get id from env (used in front)
 			$ret = $this->Application->GetVar($event->getPrefixSpecial() . '_id');
 			if ( ($ret !== false) && ($ret != '') ) {
 				$event->setEventParam(kEvent::FLAG_ID_FROM_REQUEST, true);
 
 				return $ret;
 			}
 
 			// recall selected ids array and use the first one
 			$ids = $this->Application->GetVar($event->getPrefixSpecial() . '_selected_ids');
 			if ( $ids != '' ) {
 				$ids = explode(',', $ids);
 				if ( $ids ) {
 					$ret = array_shift($ids);
 					$event->setEventParam(kEvent::FLAG_ID_FROM_REQUEST, true);
 				}
 			}
 			else { // if selected ids are not yet stored
 				$this->StoreSelectedIDs($event);
 
 				// StoreSelectedIDs sets this variable.
 				$ret = $this->Application->GetVar($event->getPrefixSpecial() . '_id');
 
 				if ( ($ret !== false) && ($ret != '') ) {
 					$event->setEventParam(kEvent::FLAG_ID_FROM_REQUEST, true);
 
 					return $ret;
 				}
 			}
 
 			return $ret;
 		}
 
 		/**
 		 * Prepares and stores selected_ids string
 		 * in Session and Application Variables
 		 * by getting all checked ids from grid plus
 		 * id passed in get/post as prefix_id
 		 *
 		 * @param kEvent $event
 		 * @param Array $direct_ids
 		 * @return Array
 		 * @access protected
 		 */
 		protected function StoreSelectedIDs(kEvent $event, $direct_ids = NULL)
 		{
 			$wid = $this->Application->GetTopmostWid($event->Prefix);
 			$session_name = rtrim($event->getPrefixSpecial() . '_selected_ids_' . $wid, '_');
 
 			$ids = $event->getEventParam('ids');
 			if ( isset($direct_ids) || ($ids !== false) ) {
 				// save ids directly if they given + reset array indexes
 				$resulting_ids = $direct_ids ? array_values($direct_ids) : ($ids ? array_values($ids) : false);
 				if ( $resulting_ids ) {
 					$this->Application->SetVar($event->getPrefixSpecial() . '_selected_ids', implode(',', $resulting_ids));
 					$this->Application->LinkVar($event->getPrefixSpecial() . '_selected_ids', $session_name, '', true);
 					$this->Application->SetVar($event->getPrefixSpecial() . '_id', $resulting_ids[0]);
 
 					return $resulting_ids;
 				}
 
 				return Array ();
 			}
 
 			$ret = Array ();
 
 			// May be we don't need this part: ?
 			$passed = $this->Application->GetVar($event->getPrefixSpecial(true) . '_id');
 			if ( $passed !== false && $passed != '' ) {
 				array_push($ret, $passed);
 			}
 
 			$ids = Array ();
 
 			// get selected ids from post & save them to session
 			$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
 
 			if ( $items_info ) {
 				$id_field = $event->getUnitConfig()->getIDField();
 
 				foreach ($items_info as $id => $field_values) {
 					if ( getArrayValue($field_values, $id_field) ) {
 						array_push($ids, $id);
 					}
 				}
 				//$ids = array_keys($items_info);
 			}
 
 			$ret = array_unique(array_merge($ret, $ids));
 
 			$this->Application->SetVar($event->getPrefixSpecial() . '_selected_ids', implode(',', $ret));
 			$this->Application->LinkVar($event->getPrefixSpecial() . '_selected_ids', $session_name, '', !$ret); // optional when IDs are missing
 
 			// This is critical - otherwise getPassedID will return last ID stored in session! (not exactly true)
 			// this smells... needs to be refactored
 			$first_id = getArrayValue($ret, 0);
 			if ( ($first_id === false) && ($event->getEventParam('raise_warnings') == 1) ) {
 				if ( $this->Application->isDebugMode() ) {
 					$this->Application->Debugger->appendTrace();
 				}
 
 				trigger_error('Requested ID for prefix <strong>' . $event->getPrefixSpecial() . '</strong> <span class="debug_error">not passed</span>', E_USER_NOTICE);
 			}
 
 			$this->Application->SetVar($event->getPrefixSpecial() . '_id', $first_id);
 			return $ret;
 		}
 
 		/**
 		 * Returns stored selected ids as an array
 		 *
 		 * @param kEvent $event
 		 * @param bool $from_session return ids from session (written, when editing was started)
 		 * @return Array
 		 * @access protected
 		 */
 		protected function getSelectedIDs(kEvent $event, $from_session = false)
 		{
 			if ( $from_session ) {
 				$wid = $this->Application->GetTopmostWid($event->Prefix);
 				$var_name = rtrim($event->getPrefixSpecial() . '_selected_ids_' . $wid, '_');
 				$ret = $this->Application->RecallVar($var_name);
 			}
 			else {
 				$ret = $this->Application->GetVar($event->getPrefixSpecial() . '_selected_ids');
 			}
 
 			return explode(',', $ret);
 		}
 
 		/**
 		 * Stores IDs, selected in grid in session
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnStoreSelected(kEvent $event)
 		{
 			$this->StoreSelectedIDs($event);
 
 			$id = $this->Application->GetVar($event->getPrefixSpecial() . '_id');
 
 			if ( $id !== false ) {
 				$event->SetRedirectParam($event->getPrefixSpecial() . '_id', $id);
 				$event->SetRedirectParam('pass', 'all,' . $event->getPrefixSpecial());
 			}
 		}
 
 		/**
 		 * Returns associative array of submitted fields for current item
 		 * Could be used while creating/editing single item -
 		 * meaning on any edit form, except grid edit
 		 *
 		 * @param kEvent $event
 		 * @return Array
 		 * @access protected
 		 */
 		protected function getSubmittedFields(kEvent $event)
 		{
 			$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
 			$field_values = $items_info ? array_shift($items_info) : Array ();
 
 			return $field_values;
 		}
 
 		/**
 		 * Removes any information about current/selected ids
 		 * from Application variables and Session
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function clearSelectedIDs(kEvent $event)
 		{
 			$prefix_special = $event->getPrefixSpecial();
 
 			$ids = implode(',', $this->getSelectedIDs($event, true));
 			$event->setEventParam('ids', $ids);
 
 			$wid = $this->Application->GetTopmostWid($event->Prefix);
 			$session_name = rtrim($prefix_special . '_selected_ids_' . $wid, '_');
 
 			$this->Application->RemoveVar($session_name);
 			$this->Application->SetVar($prefix_special . '_selected_ids', '');
 
 			$this->Application->SetVar($prefix_special . '_id', ''); // $event->getPrefixSpecial(true) . '_id' too may be
 		}
 
 		/**
 		 * Common builder part for Item & List
 		 *
 		 * @param kDBBase|kDBItem|kDBList $object
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function dbBuild(&$object, kEvent $event)
 		{
 			// for permission checking inside item/list build events
 			$event->setEventParam('top_prefix', $this->Application->GetTopmostPrefix($event->Prefix, true));
 
 			if ( $event->getEventParam('form_name') !== false ) {
 				$form_name = $event->getEventParam('form_name');
 			}
 			else {
 				$request_forms = $this->Application->GetVar('forms', Array ());
 				$form_name = (string)getArrayValue($request_forms, $object->getPrefixSpecial());
 			}
 
 			$object->Configure($event->getEventParam('populate_ml_fields') || $event->getUnitConfig()->getPopulateMlFields(), $form_name);
 			$this->PrepareObject($object, $event);
 
 			$parent_event = $event->getEventParam('parent_event');
 
 			if ( is_object($parent_event) ) {
 				$object->setParentEvent($parent_event);
 			}
 
 			// force live table if specified or is original item
 			$live_table = $event->getEventParam('live_table') || $event->Special == 'original';
 
 			if ( $this->UseTempTables($event) && !$live_table ) {
 				$object->SwitchToTemp();
 			}
 
 			$this->Application->setEvent($event->getPrefixSpecial(), '');
 
 			$save_event = $this->UseTempTables($event) && $this->Application->GetTopmostPrefix($event->Prefix) == $event->Prefix ? 'OnSave' : 'OnUpdate';
 			$this->Application->SetVar($event->getPrefixSpecial() . '_SaveEvent', $save_event);
 		}
 
 		/**
 		 * Checks, that currently loaded item is allowed for viewing (non permission-based)
 		 *
 		 * @param kEvent $event
 		 * @return bool
 		 * @access protected
 		 */
 		protected function checkItemStatus(kEvent $event)
 		{
 			$status_field = $event->getUnitConfig()->getStatusField(true);
 
 			if ( !$status_field ) {
 				return true;
 			}
 
 			if ( $status_field == 'Status' || $status_field == 'Enabled' ) {
+				/** @var kDBItem $object */
 				$object = $event->getObject();
-				/* @var $object kDBItem */
 
 				if ( !$object->isLoaded() ) {
 					return true;
 				}
 
 				return $object->GetDBField($status_field) == STATUS_ACTIVE;
 			}
 
 			return true;
 		}
 
 		/**
 		 * Shows not found template content
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function _errorNotFound(kEvent $event)
 		{
 			if ( $event->getEventParam('raise_warnings') === 0 ) {
 				// when it's possible, that autoload fails do nothing
 				return;
 			}
 
 			if ( $this->Application->isDebugMode() ) {
 				$this->Application->Debugger->appendTrace();
 			}
 
 			trigger_error('ItemLoad Permission Failed for prefix [' . $event->getPrefixSpecial() . '] in <strong>checkItemStatus</strong>, leading to "404 Not Found"', E_USER_NOTICE);
 
 			$this->Application->UrlManager->show404();
 		}
 
 		/**
 		 * Builds item (loads if needed)
 		 *
 		 * Pattern: Prototype Manager
 		 *
 		 * @param kEvent $event
 		 * @access protected
 		 */
 		protected function OnItemBuild(kEvent $event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$this->dbBuild($object, $event);
 
 			$sql = $this->ItemPrepareQuery($event);
 			$sql = $this->Application->ReplaceLanguageTags($sql);
 			$object->setSelectSQL($sql);
 
 			// 2. loads if allowed
 			$auto_load = $event->getUnitConfig()->getAutoLoad();
 			$skip_autoload = $event->getEventParam('skip_autoload');
 
 			if ( $auto_load && !$skip_autoload ) {
 				$perm_status = true;
 				$user_id = $this->Application->InitDone ? $this->Application->RecallVar('user_id') : USER_ROOT;
 				$event->setEventParam('top_prefix', $this->Application->GetTopmostPrefix($event->Prefix, true));
 				$status_checked = false;
 
 				if ( $user_id == USER_ROOT || $this->CheckPermission($event) ) {
 					// don't autoload item, when user doesn't have view permission
 					$this->LoadItem($event);
 
 					$status_checked = true;
 					$editing_mode = defined('EDITING_MODE') ? EDITING_MODE : false;
 					$id_from_request = $event->getEventParam(kEvent::FLAG_ID_FROM_REQUEST);
 
 					if ( $user_id != USER_ROOT
 						&& !$this->Application->isAdmin
 						&& !($editing_mode || ($id_from_request ? $this->checkItemStatus($event) : true))
 					) {
 						// non-root user AND on front-end AND (not editing mode || incorrect status)
 						$perm_status = false;
 					}
 				}
 				else {
 					$perm_status = false;
 				}
 
 				if ( !$perm_status ) {
 					// when no permission to view item -> redirect to no permission template
 					$this->_processItemLoadingError($event, $status_checked);
 				}
 			}
 
+			/** @var Params $actions */
 			$actions = $this->Application->recallObject('kActions');
-			/* @var $actions Params */
 
 			$actions->Set($event->getPrefixSpecial() . '_GoTab', '');
 			$actions->Set($event->getPrefixSpecial() . '_GoId', '');
 			$actions->Set('forms[' . $event->getPrefixSpecial() . ']', $object->getFormName());
 		}
 
 		/**
 		 * Processes case, when item wasn't loaded because of lack of permissions
 		 *
 		 * @param kEvent $event
 		 * @param bool $status_checked
 		 * @throws kNoPermissionException
 		 * @return void
 		 * @access protected
 		 */
 		protected function _processItemLoadingError($event, $status_checked)
 		{
 			$current_template = $this->Application->GetVar('t');
 			$redirect_template = $this->Application->isAdmin ? 'no_permission' : $this->Application->ConfigValue('NoPermissionTemplate');
 			$error_msg = 'ItemLoad Permission Failed for prefix [' . $event->getPrefixSpecial() . '] in <strong>' . ($status_checked ? 'checkItemStatus' : 'CheckPermission') . '</strong>';
 
 			if ( $current_template == $redirect_template ) {
 				// don't perform "no_permission" redirect if already on a "no_permission" template
 				if ( $this->Application->isDebugMode() ) {
 					$this->Application->Debugger->appendTrace();
 				}
 
 				trigger_error($error_msg, E_USER_NOTICE);
 
 				return;
 			}
 
 			if ( MOD_REWRITE ) {
 				$redirect_params = Array (
 					'm_cat_id' => 0,
 					'next_template' => 'external:' . $_SERVER['REQUEST_URI'],
 				);
 			}
 			else {
 				$redirect_params = Array (
 					'next_template' => $current_template,
 				);
 			}
 
 			$exception = new kNoPermissionException($error_msg);
 			$exception->setup($redirect_template, $redirect_params);
 
 			throw $exception;
 		}
 
 		/**
 		 * Build sub-tables array from configs
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnTempHandlerBuild(kEvent $event)
 		{
+			/** @var kTempTablesHandler $object */
 			$object = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler');
-			/* @var $object kTempTablesHandler */
 
+			/** @var kEvent $parent_event */
 			$parent_event = $event->getEventParam('parent_event');
-			/* @var $parent_event kEvent */
 
 			if ( is_object($parent_event) ) {
 				$object->setParentEvent($parent_event);
 			}
 
 			$object->BuildTables($event->Prefix, $this->getSelectedIDs($event));
 		}
 
 		/**
 		 * Checks, that object used in event should use temp tables
 		 *
 		 * @param kEvent $event
 		 * @return bool
 		 * @access protected
 		 */
 		protected function UseTempTables(kEvent $event)
 		{
 			$top_prefix = $this->Application->GetTopmostPrefix($event->Prefix); // passed parent, not always actual
 			$special = ($top_prefix == $event->Prefix) ? $event->Special : $this->getMainSpecial($event);
 
 			return $this->Application->IsTempMode($event->Prefix, $special);
 		}
 
 		/**
 		 * Load item if id is available
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function LoadItem(kEvent $event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$id = $this->getPassedID($event);
 
 			if ( $object->isLoaded() && !is_array($id) && ($object->GetID() == $id) ) {
 				// object is already loaded by same id
 				return ;
 			}
 
 			if ( $object->Load($id) ) {
+				/** @var Params $actions */
 				$actions = $this->Application->recallObject('kActions');
-				/* @var $actions Params */
 
 				$actions->Set($event->getPrefixSpecial() . '_id', $object->GetID());
 			}
 			else {
 				$object->setID( is_array($id) ? false : $id );
 			}
 		}
 
 		/**
 		 * Builds list
 		 *
 		 * Pattern: Prototype Manager
 		 *
 		 * @param kEvent $event
 		 * @access protected
 		 */
 		protected function OnListBuild(kEvent $event)
 		{
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			/*if ( $this->Application->isDebugMode() ) {
 				$event_params = http_build_query($event->getEventParams());
 				$this->Application->Debugger->appendHTML('InitList "<strong>' . $event->getPrefixSpecial() . '</strong>" (' . $event_params . ')');
 			}*/
 
 			$this->dbBuild($object, $event);
 
 			if ( !$object->isMainList() && $event->getEventParam('main_list') ) {
 				// once list is set to main, then even "requery" parameter can't remove that
 				/*$passed = $this->Application->GetVar('passed');
 				$this->Application->SetVar('passed', $passed . ',' . $event->Prefix);*/
 
 				$object->becameMain();
 			}
 
 			$object->setGridName($event->getEventParam('grid'));
 
 			$sql = $this->ListPrepareQuery($event);
 			$sql = $this->Application->ReplaceLanguageTags($sql);
 			$object->setSelectSQL($sql);
 
 			$object->reset();
 
 			if ( $event->getEventParam('skip_parent_filter') === false ) {
 				$object->linkToParent($this->getMainSpecial($event));
 			}
 
 			$this->AddFilters($event);
 			$this->SetCustomQuery($event); // new!, use this for dynamic queries based on specials for ex.
 			$this->SetPagination($event);
 			$this->SetSorting($event);
 
+			/** @var Params $actions */
 			$actions = $this->Application->recallObject('kActions');
-			/* @var $actions Params */
 
 			$actions->Set('remove_specials[' . $event->getPrefixSpecial() . ']', '0');
 			$actions->Set($event->getPrefixSpecial() . '_GoTab', '');
 		}
 
 		/**
 		 * Returns special of main item for linking with sub-item
 		 *
 		 * @param kEvent $event
 		 * @return string
 		 * @access protected
 		 */
 		protected function getMainSpecial(kEvent $event)
 		{
 			$main_special = $event->getEventParam('main_special');
 
 			if ( $main_special === false ) {
 				// main item's special not passed
 
 				if ( substr($event->Special, -5) == '-item' ) {
 					// temp handler added "-item" to given special -> process that here
 					return substr($event->Special, 0, -5);
 				}
 
 				// by default subitem's special is used for main item searching
 				return $event->Special;
 			}
 
 			return $main_special;
 		}
 
 		/**
 		 * Apply any custom changes to list's sql query
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
 		protected function SetCustomQuery(kEvent $event)
 		{
 
 		}
 
 		/**
 		 * Set's new per-page for grid
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnSetPerPage(kEvent $event)
 		{
 			$per_page = $this->Application->GetVar($event->getPrefixSpecial(true) . '_PerPage');
 			$event->SetRedirectParam($event->getPrefixSpecial() . '_PerPage', $per_page);
 			$event->SetRedirectParam('pass', 'all,' . $event->getPrefixSpecial());
 
 			if ( !$this->Application->isAdminUser ) {
+				/** @var ListHelper $list_helper */
 				$list_helper = $this->Application->recallObject('ListHelper');
-				/* @var $list_helper ListHelper */
 
 				$this->_passListParams($event, 'per_page');
 			}
 		}
 
 		/**
 		 * Occurs when page is changed (only for hooking)
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnSetPage(kEvent $event)
 		{
 			$page = $this->Application->GetVar($event->getPrefixSpecial(true) . '_Page');
 			$event->SetRedirectParam($event->getPrefixSpecial() . '_Page', $page);
 			$event->SetRedirectParam('pass', 'all,' . $event->getPrefixSpecial());
 
 			if ( !$this->Application->isAdminUser ) {
 				$this->_passListParams($event, 'page');
 			}
 		}
 
 		/**
 		 * Passes through main list pagination and sorting
 		 *
 		 * @param kEvent $event
 		 * @param string $skip_var
 		 * @return void
 		 * @access protected
 		 */
 		protected function _passListParams($event, $skip_var)
 		{
 			$param_names = array_diff(Array ('page', 'per_page', 'sort_by'), Array ($skip_var));
 
+			/** @var ListHelper $list_helper */
 			$list_helper = $this->Application->recallObject('ListHelper');
-			/* @var $list_helper ListHelper */
 
 			foreach ($param_names as $param_name) {
 				$value = $this->Application->GetVar($param_name);
 
 				switch ($param_name) {
 					case 'page':
 						if ( $value > 1 ) {
 							$event->SetRedirectParam('page', $value);
 						}
 						break;
 
 					case 'per_page':
 						if ( $value > 0 ) {
 							if ( $value != $list_helper->getDefaultPerPage($event->Prefix) ) {
 								$event->SetRedirectParam('per_page', $value);
 							}
 						}
 						break;
 
 					case 'sort_by':
 						$event->setPseudoClass('_List');
+
+						/** @var kDBList $object */
 						$object = $event->getObject(Array ('main_list' => 1));
-						/* @var $object kDBList */
 
 						if ( $list_helper->hasUserSorting($object) ) {
 							$event->SetRedirectParam('sort_by', $value);
 						}
 						break;
 				}
 			}
 		}
 
 		/**
 		 * Set's correct page for list based on data provided with event
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
 		protected function SetPagination(kEvent $event)
 		{
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			// get PerPage (forced -> session -> config -> 10)
 			$object->SetPerPage($this->getPerPage($event));
 
 			// main lists on Front-End have special get parameter for page
 			$page = $object->isMainList() ? $this->Application->GetVar('page') : false;
 
 			if ( !$page ) {
 				// page is given in "env" variable for given prefix
 				$page = $this->Application->GetVar($event->getPrefixSpecial() . '_Page');
 			}
 
 			if ( !$page && $event->Special ) {
 				// when not part of env, then variables like "prefix.special_Page" are
 				// replaced (by PHP) with "prefix_special_Page", so check for that too
 				$page = $this->Application->GetVar($event->getPrefixSpecial(true) . '_Page');
 			}
 
 			if ( !$object->isMainList() ) {
 				// main lists doesn't use session for page storing
 				$this->Application->StoreVarDefault($event->getPrefixSpecial() . '_Page', 1, true); // true for optional
 
 				if ( $page ) {
 					// page found in request -> store in session
 					$this->Application->StoreVar($event->getPrefixSpecial() . '_Page', $page, true); //true for optional
 				}
 				else {
 					// page not found in request -> get from session
 					$page = $this->Application->RecallVar($event->getPrefixSpecial() . '_Page');
 				}
 
 				if ( !$event->getEventParam('skip_counting') ) {
 					// when stored page is larger, then maximal list page number
 					// (such case is also processed in kDBList::Query method)
 					$pages = $object->GetTotalPages();
 
 					if ( $page > $pages ) {
 						$page = 1;
 						$this->Application->StoreVar($event->getPrefixSpecial() . '_Page', 1, true);
 					}
 				}
 			}
 
 			$object->SetPage($page);
 		}
 
 		/**
 		 * Returns current per-page setting for list
 		 *
 		 * @param kEvent $event
 		 * @return int
 		 * @access protected
 		 */
 		protected function getPerPage(kEvent $event)
 		{
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			$per_page = $event->getEventParam('per_page');
 
 			if ( $per_page ) {
 				// per-page is passed as tag parameter to PrintList, InitList, etc.
 				$config_mapping = $event->getUnitConfig()->getConfigMapping();
 
 				// 2. per-page setting is stored in configuration variable
 				if ( $config_mapping ) {
 					// such pseudo per-pages are only defined in templates directly
 					switch ($per_page) {
 						case 'short_list':
 							$per_page = $this->Application->ConfigValue($config_mapping['ShortListPerPage']);
 							break;
 
 						case 'default':
 							$per_page = $this->Application->ConfigValue($config_mapping['PerPage']);
 							break;
 					}
 				}
 
 				return $per_page;
 			}
 
 			if ( !$per_page && $object->isMainList() ) {
 				// main lists on Front-End have special get parameter for per-page
 				$per_page = $this->Application->GetVar('per_page');
 			}
 
 			if ( !$per_page ) {
 				// per-page is given in "env" variable for given prefix
 				$per_page = $this->Application->GetVar($event->getPrefixSpecial() . '_PerPage');
 			}
 
 			if ( !$per_page && $event->Special ) {
 				// when not part of env, then variables like "prefix.special_PerPage" are
 				// replaced (by PHP) with "prefix_special_PerPage", so check for that too
 				$per_page = $this->Application->GetVar($event->getPrefixSpecial(true) . '_PerPage');
 			}
 
 			if ( !$object->isMainList() ) {
 				// per-page given in env and not in main list
 				$view_name = $this->Application->RecallVar($event->getPrefixSpecial() . '_current_view');
 
 				if ( $per_page ) {
 					// per-page found in request -> store in session and persistent session
 					$this->setListSetting($event, 'PerPage', $per_page);
 				}
 				else {
 					// per-page not found in request -> get from pesistent session (or session)
 					$per_page = $this->getListSetting($event, 'PerPage');
 				}
 			}
 
 			if ( !$per_page ) {
 				// per page wan't found in request/session/persistent session
+				/** @var ListHelper $list_helper */
 				$list_helper = $this->Application->recallObject('ListHelper');
-				/* @var $list_helper ListHelper */
 
 				// allow to override default per-page value from tag
 				$default_per_page = $event->getEventParam('default_per_page');
 
 				if ( !is_numeric($default_per_page) ) {
 					$default_per_page = $this->Application->ConfigValue('DefaultGridPerPage');
 				}
 
 				$per_page = $list_helper->getDefaultPerPage($event->Prefix, $default_per_page);
 			}
 
 			return $per_page;
 		}
 
 		/**
 		 * Set's correct sorting for list based on data provided with event
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
 		protected function SetSorting(kEvent $event)
 		{
 			$event->setPseudoClass('_List');
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			if ( $object->isMainList() ) {
 				$sort_by = $this->Application->GetVar('sort_by');
 				$cur_sort1 = $cur_sort1_dir = $cur_sort2 = $cur_sort2_dir = false;
 
 				if ( $sort_by ) {
 					$sortings = explode('|', $sort_by);
 					list ($cur_sort1, $cur_sort1_dir) = explode(',', $sortings[0]);
 
 					if ( isset($sortings[1]) ) {
 						list ($cur_sort2, $cur_sort2_dir) = explode(',', $sortings[1]);
 					}
 				}
 			}
 			else {
 				$sorting_settings = $this->getListSetting($event, 'Sortings');
 
 				$cur_sort1 = getArrayValue($sorting_settings, 'Sort1');
 				$cur_sort1_dir = getArrayValue($sorting_settings, 'Sort1_Dir');
 				$cur_sort2 = getArrayValue($sorting_settings, 'Sort2');
 				$cur_sort2_dir = getArrayValue($sorting_settings, 'Sort2_Dir');
 			}
 
 			$tag_sort_by = $event->getEventParam('sort_by');
 
 			if ( $tag_sort_by ) {
 				if ( $tag_sort_by == 'random' ) {
 					$object->AddOrderField('RAND()', '');
 				}
 				else {
 					// multiple sortings could be specified at once
 					$tag_sort_by = explode('|', $tag_sort_by);
 
 					foreach ($tag_sort_by as $sorting_element) {
 						list ($by, $dir) = explode(',', $sorting_element);
 						$object->AddOrderField($by, $dir);
 					}
 				}
 			}
 
 			$list_sortings = $this->_getDefaultSorting($event);
 
 			// use default if not specified in session
 			if ( !$cur_sort1 || !$cur_sort1_dir ) {
 				$sorting = getArrayValue($list_sortings, 'Sorting');
 
 				if ( $sorting ) {
 					reset($sorting);
 					$cur_sort1 = key($sorting);
 					$cur_sort1_dir = current($sorting);
 
 					if ( next($sorting) ) {
 						$cur_sort2 = key($sorting);
 						$cur_sort2_dir = current($sorting);
 					}
 				}
 			}
 
 			// always add forced sorting before any user sorting fields
+			/** @var Array $forced_sorting */
 			$forced_sorting = getArrayValue($list_sortings, 'ForcedSorting');
-			/* @var $forced_sorting Array */
 
 			if ( $forced_sorting ) {
 				foreach ($forced_sorting as $field => $dir) {
 					$object->AddOrderField($field, $dir);
 				}
 			}
 
 			// add user sorting fields
 			if ( $cur_sort1 != '' && $cur_sort1_dir != '' ) {
 				$object->AddOrderField($cur_sort1, $cur_sort1_dir);
 			}
 
 			if ( $cur_sort2 != '' && $cur_sort2_dir != '' ) {
 				$object->AddOrderField($cur_sort2, $cur_sort2_dir);
 			}
 		}
 
 		/**
 		 * Returns default list sortings
 		 *
 		 * @param kEvent $event
 		 * @return Array
 		 * @access protected
 		 */
 		protected function _getDefaultSorting(kEvent $event)
 		{
 			$config = $event->getUnitConfig();
 			$sorting_configs = $config->getConfigMapping();
 			$list_sortings = $config->getListSortingsBySpecial($event);
 
 			if ( $sorting_configs && array_key_exists('DefaultSorting1Field', $sorting_configs) ) {
 				// sorting defined in configuration variables overrides one from unit config
 				$list_sortings['Sorting'] = Array (
 					$this->Application->ConfigValue($sorting_configs['DefaultSorting1Field']) => $this->Application->ConfigValue($sorting_configs['DefaultSorting1Dir']),
 					$this->Application->ConfigValue($sorting_configs['DefaultSorting2Field']) => $this->Application->ConfigValue($sorting_configs['DefaultSorting2Dir']),
 				);
 
 				// TODO: lowercase configuration variable values in db, instead of here
 				$list_sortings['Sorting'] = array_map('strtolower', $list_sortings['Sorting']);
 			}
 
 			return $list_sortings ? $list_sortings : Array ();
 		}
 
 		/**
 		 * Gets list setting by name (persistent or real session)
 		 *
 		 * @param kEvent $event
 		 * @param string $variable_name
 		 * @return string|Array
 		 * @access protected
 		 */
 		protected function getListSetting(kEvent $event, $variable_name)
 		{
 			$view_name = $this->Application->RecallVar($event->getPrefixSpecial() . '_current_view');
 			$storage_prefix = $event->getEventParam('same_special') ? $event->Prefix : $event->getPrefixSpecial();
 
 			// get sorting from persistent session
 			$default_value = $this->Application->isAdmin ? ALLOW_DEFAULT_SETTINGS : false;
 			$variable_value = $this->Application->RecallPersistentVar($storage_prefix . '_' . $variable_name . '.' . $view_name, $default_value);
 
 			/*if ( !$variable_value ) {
 				// get sorting from session
 				$variable_value = $this->Application->RecallVar($storage_prefix . '_' . $variable_name);
 			}*/
 
 			if ( kUtil::IsSerialized($variable_value) ) {
 				$variable_value = unserialize($variable_value);
 			}
 
 			return $variable_value;
 		}
 
 		/**
 		 * Sets list setting by name (persistent and real session)
 		 *
 		 * @param kEvent $event
 		 * @param string $variable_name
 		 * @param string|Array $variable_value
 		 * @return void
 		 * @access protected
 		 */
 		protected function setListSetting(kEvent $event, $variable_name, $variable_value = NULL)
 		{
 			$view_name = $this->Application->RecallVar($event->getPrefixSpecial() . '_current_view');
 //			$this->Application->StoreVar($event->getPrefixSpecial() . '_' . $variable_name, $variable_value, true); //true for optional
 
 			if ( isset($variable_value) ) {
 				if ( is_array($variable_value) ) {
 					$variable_value = serialize($variable_value);
 				}
 
 				$this->Application->StorePersistentVar($event->getPrefixSpecial() . '_' . $variable_name . '.' . $view_name, $variable_value, true); //true for optional
 			}
 			else {
 				$this->Application->RemovePersistentVar($event->getPrefixSpecial() . '_' . $variable_name . '.' . $view_name);
 			}
 		}
 
 		/**
 		 * Add filters found in session
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function AddFilters(kEvent $event)
 		{
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			$edit_mark = rtrim($this->Application->GetSID() . '_' . $this->Application->GetTopmostWid($event->Prefix), '_');
 
 			// add search filter
 			$filter_data = $this->Application->RecallVar($event->getPrefixSpecial() . '_search_filter');
 
 			if ( $filter_data ) {
 				$filter_data = unserialize($filter_data);
 
 				foreach ($filter_data as $filter_field => $filter_params) {
 					$filter_type = ($filter_params['type'] == 'having') ? kDBList::HAVING_FILTER : kDBList::WHERE_FILTER;
 					$filter_value = str_replace(EDIT_MARK, $edit_mark, $filter_params['value']);
 					$object->addFilter($filter_field, $filter_value, $filter_type, kDBList::FLT_SEARCH);
 				}
 			}
 
 			// add custom filter
 			$view_name = $this->Application->RecallVar($event->getPrefixSpecial() . '_current_view');
 			$custom_filters = $this->Application->RecallPersistentVar($event->getPrefixSpecial() . '_custom_filter.' . $view_name);
 
 			if ( $custom_filters ) {
 				$grid_name = $event->getEventParam('grid');
 				$custom_filters = unserialize($custom_filters);
 
 				if ( isset($custom_filters[$grid_name]) ) {
 					foreach ($custom_filters[$grid_name] as $field_name => $field_options) {
 						list ($filter_type, $field_options) = each($field_options);
 
 						if ( isset($field_options['value']) && $field_options['value'] ) {
 							$filter_type = ($field_options['sql_filter_type'] == 'having') ? kDBList::HAVING_FILTER : kDBList::WHERE_FILTER;
 							$filter_value = str_replace(EDIT_MARK, $edit_mark, $field_options['value']);
 							$object->addFilter($field_name, $filter_value, $filter_type, kDBList::FLT_CUSTOM);
 						}
 					}
 				}
 			}
 
 			// add view filter
 			$view_filter = $this->Application->RecallVar($event->getPrefixSpecial() . '_view_filter');
 
 			if ( $view_filter ) {
 				$view_filter = unserialize($view_filter);
 
+				/** @var kMultipleFilter $temp_filter */
 				$temp_filter = $this->Application->makeClass('kMultipleFilter');
-				/* @var $temp_filter kMultipleFilter */
 
 				$filter_menu = $event->getUnitConfig()->getFilterMenu();
 
 				$group_key = 0;
 				$group_count = count($filter_menu['Groups']);
 
 				while ($group_key < $group_count) {
 					$group_info = $filter_menu['Groups'][$group_key];
 
 					$temp_filter->setType(constant('kDBList::FLT_TYPE_' . $group_info['mode']));
 					$temp_filter->clearFilters();
 
 					foreach ($group_info['filters'] as $flt_id) {
 						$sql_key = getArrayValue($view_filter, $flt_id) ? 'on_sql' : 'off_sql';
 
 						if ( $filter_menu['Filters'][$flt_id][$sql_key] != '' ) {
 							$temp_filter->addFilter('view_filter_' . $flt_id, $filter_menu['Filters'][$flt_id][$sql_key]);
 						}
 					}
 
 					$object->addFilter('view_group_' . $group_key, $temp_filter, $group_info['type'], kDBList::FLT_VIEW);
 					$group_key++;
 				}
 			}
 
 			// add item filter
 			if ( $object->isMainList() ) {
 				$this->applyItemFilters($event);
 			}
 		}
 
 		/**
 		 * Applies item filters
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function applyItemFilters($event)
 		{
 			$filter_values = $this->Application->GetVar('filters', Array ());
 
 			if ( !$filter_values ) {
 				return;
 			}
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			$where_clause = Array (
 				'ItemPrefix = ' . $this->Conn->qstr($object->Prefix),
 				'FilterField IN (' . implode(',', $this->Conn->qstrArray(array_keys($filter_values))) . ')',
 				'Enabled = 1',
 			);
 
 			$sql = 'SELECT *
 					FROM ' . $this->Application->getUnitConfig('item-filter')->getTableName() . '
 					WHERE (' . implode(') AND (', $where_clause) . ')';
 			$filters = $this->Conn->Query($sql, 'FilterField');
 
 			foreach ($filters as $filter_field => $filter_data) {
 				$filter_value = $filter_values[$filter_field];
 
 				if ( "$filter_value" === '' ) {
 					// ListManager don't pass empty values, but check here just in case
 					continue;
 				}
 
 				$table_name = $object->isVirtualField($filter_field) ? '' : '%1$s.';
 
 				switch ($filter_data['FilterType']) {
 					case 'radio':
 						$filter_value = $table_name . '`' . $filter_field . '` = ' . $this->Conn->qstr($filter_value);
 						break;
 
 					case 'checkbox':
 						$filter_value = explode('|', substr($filter_value, 1, -1));
 						$filter_value = $this->Conn->qstrArray($filter_value, 'escape');
 
 						if ( $object->GetFieldOption($filter_field, 'multiple') ) {
 							$filter_value = $table_name . '`' . $filter_field . '` LIKE "%|' . implode('|%" OR ' . $table_name . '`' . $filter_field . '` LIKE "%|', $filter_value) . '|%"';
 						}
 						else {
 							$filter_value = $table_name . '`' . $filter_field . '` IN (' . implode(',', $filter_value) . ')';
 						}
 						break;
 
 					case 'range':
 						$filter_value = $this->Conn->qstrArray(explode('-', $filter_value));
 						$filter_value = $table_name . '`' . $filter_field . '` BETWEEN ' . $filter_value[0] . ' AND ' . $filter_value[1];
 						break;
 				}
 
 				$object->addFilter('item_filter_' . $filter_field, $filter_value, $object->isVirtualField($filter_field) ? kDBList::HAVING_FILTER : kDBList::WHERE_FILTER);
 			}
 		}
 
 		/**
 		 * Set's new sorting for list
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnSetSorting(kEvent $event)
 		{
 			$sorting_settings = $this->getListSetting($event, 'Sortings');
 			$cur_sort1 = getArrayValue($sorting_settings, 'Sort1');
 			$cur_sort1_dir = getArrayValue($sorting_settings, 'Sort1_Dir');
 
 			$use_double_sorting = $this->Application->ConfigValue('UseDoubleSorting');
 
 			if ( $use_double_sorting ) {
 				$cur_sort2 = getArrayValue($sorting_settings, 'Sort2');
 				$cur_sort2_dir = getArrayValue($sorting_settings, 'Sort2_Dir');
 			}
 
 			$passed_sort1 = $this->Application->GetVar($event->getPrefixSpecial(true) . '_Sort1');
 			if ( $cur_sort1 == $passed_sort1 ) {
 				$cur_sort1_dir = $cur_sort1_dir == 'asc' ? 'desc' : 'asc';
 			}
 			else {
 				if ( $use_double_sorting ) {
 					$cur_sort2 = $cur_sort1;
 					$cur_sort2_dir = $cur_sort1_dir;
 				}
 
 				$cur_sort1 = $passed_sort1;
 				$cur_sort1_dir = 'asc';
 			}
 
 			$sorting_settings = Array ('Sort1' => $cur_sort1, 'Sort1_Dir' => $cur_sort1_dir);
 
 			if ( $use_double_sorting ) {
 				$sorting_settings['Sort2'] = $cur_sort2;
 				$sorting_settings['Sort2_Dir'] = $cur_sort2_dir;
 			}
 
 			$this->setListSetting($event, 'Sortings', $sorting_settings);
 		}
 
 		/**
 		 * Set sorting directly to session (used for category item sorting (front-end), grid sorting (admin, view menu)
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnSetSortingDirect(kEvent $event)
 		{
 			// used on Front-End in category item lists
 			$prefix_special = $event->getPrefixSpecial();
 			$combined = $this->Application->GetVar($event->getPrefixSpecial(true) . '_CombinedSorting');
 
 			if ( $combined ) {
 				list ($field, $dir) = explode('|', $combined);
 
 				if ( $this->Application->isAdmin || !$this->Application->GetVar('main_list') ) {
 					$this->setListSetting($event, 'Sortings', Array ('Sort1' => $field, 'Sort1_Dir' => $dir));
 				}
 				else {
 					$event->setPseudoClass('_List');
 					$this->Application->SetVar('sort_by', $field . ',' . $dir);
 
+					/** @var kDBList $object */
 					$object = $event->getObject(Array ('main_list' => 1));
-					/* @var $object kDBList */
 
+					/** @var ListHelper $list_helper */
 					$list_helper = $this->Application->recallObject('ListHelper');
-					/* @var $list_helper ListHelper */
 
 					$this->_passListParams($event, 'sort_by');
 
 					if ( $list_helper->hasUserSorting($object) ) {
 						$event->SetRedirectParam('sort_by', $field . ',' . strtolower($dir));
 					}
 
 					$event->SetRedirectParam('pass', 'm');
 				}
 
 				return;
 			}
 
 			// used in "View Menu -> Sort" menu in administrative console
 			$field_pos = $this->Application->GetVar($event->getPrefixSpecial(true) . '_SortPos');
 			$this->Application->LinkVar($event->getPrefixSpecial(true) . '_Sort' . $field_pos, $prefix_special . '_Sort' . $field_pos);
 			$this->Application->LinkVar($event->getPrefixSpecial(true) . '_Sort' . $field_pos . '_Dir', $prefix_special . '_Sort' . $field_pos . '_Dir');
 		}
 
 		/**
 		 * Reset grid sorting to default (from config)
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnResetSorting(kEvent $event)
 		{
 			$this->setListSetting($event, 'Sortings');
 		}
 
 		/**
 		 * Sets grid refresh interval
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnSetAutoRefreshInterval(kEvent $event)
 		{
 			$refresh_interval = $this->Application->GetVar('refresh_interval');
 
 			$view_name = $this->Application->RecallVar($event->getPrefixSpecial() . '_current_view');
 			$this->Application->StorePersistentVar($event->getPrefixSpecial() . '_refresh_interval.' . $view_name, $refresh_interval);
 		}
 
 		/**
 		 * Changes auto-refresh state for grid
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAutoRefreshToggle(kEvent $event)
 		{
 			$refresh_intervals = $this->Application->ConfigValue('AutoRefreshIntervals');
 			if ( !$refresh_intervals ) {
 				return;
 			}
 
 			$view_name = $this->Application->RecallVar($event->getPrefixSpecial() . '_current_view');
 			$auto_refresh = $this->Application->RecallPersistentVar($event->getPrefixSpecial() . '_auto_refresh.' . $view_name);
 
 			if ( $auto_refresh === false ) {
 				$refresh_intervals = explode(',', $refresh_intervals);
 				$this->Application->StorePersistentVar($event->getPrefixSpecial() . '_refresh_interval.' . $view_name, $refresh_intervals[0]);
 			}
 
 			$this->Application->StorePersistentVar($event->getPrefixSpecial() . '_auto_refresh.' . $view_name, $auto_refresh ? 0 : 1);
 		}
 
 		/**
 		 * Creates needed sql query to load item,
 		 * if no query is defined in config for
 		 * special requested, then use list query
 		 *
 		 * @param kEvent $event
 		 * @return string
 		 * @access protected
 		 */
 		protected function ItemPrepareQuery(kEvent $event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$sqls = $object->getFormOption('ItemSQLs', Array ());
 			$special = isset($sqls[$event->Special]) ? $event->Special : '';
 
 			// preferred special not found in ItemSQLs -> use analog from ListSQLs
 
 			return isset($sqls[$special]) ? $sqls[$special] : $this->ListPrepareQuery($event);
 		}
 
 		/**
 		 * Creates needed sql query to load list,
 		 * if no query is defined in config for
 		 * special requested, then use default
 		 * query
 		 *
 		 * @param kEvent $event
 		 * @return string
 		 * @access protected
 		 */
 		protected function ListPrepareQuery(kEvent $event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$sqls = $object->getFormOption('ListSQLs', Array ());
 
 			return $sqls[array_key_exists($event->Special, $sqls) ? $event->Special : ''];
 		}
 
 		/**
 		 * Apply custom processing to item
 		 *
 		 * @param kEvent $event
 		 * @param string $type
 		 * @return void
 		 * @access protected
 		 */
 		protected function customProcessing(kEvent $event, $type)
 		{
 
 		}
 
 		/* Edit Events mostly used in Admin */
 
 		/**
 		 * Creates new kDBItem
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnCreate(kEvent $event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject(Array ('skip_autoload' => true));
-			/* @var $object kDBItem */
 
 			$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
 
 			if ( !$items_info ) {
 				return;
 			}
 
 			list($id, $field_values) = each($items_info);
 			$object->setID($id);
 			$object->SetFieldsFromHash($field_values);
 			$event->setEventParam('form_data', $field_values);
 
 			$this->customProcessing($event, 'before');
 
 			// look at kDBItem' Create for ForceCreateId description, it's rarely used and is NOT set by default
 			if ( $object->Create($event->getEventParam('ForceCreateId')) ) {
 				$this->customProcessing($event, 'after');
 				$event->SetRedirectParam('opener', 'u');
 				return;
 			}
 
 			$event->redirect = false;
 			$event->status = kEvent::erFAIL;
 			$this->Application->SetVar($event->getPrefixSpecial() . '_SaveEvent', 'OnCreate');
 		}
 
 		/**
 		 * Updates kDBItem
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnUpdate(kEvent $event)
 		{
 			if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
 				$event->status = kEvent::erFAIL;
 				return;
 			}
 
 			$this->_update($event);
 
 			$event->SetRedirectParam('opener', 'u');
 		}
 
 		/**
 		 * Updates data in database based on request
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function _update(kEvent $event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject(Array ('skip_autoload' => true));
-			/* @var $object kDBItem */
 
 			$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
 
 			if ( $items_info ) {
 				foreach ($items_info as $id => $field_values) {
 					$object->Load($id);
 					$object->SetFieldsFromHash($field_values);
 					$event->setEventParam('form_data', $field_values);
 					$this->customProcessing($event, 'before');
 
 					if ( $object->Update($id) ) {
 						$this->customProcessing($event, 'after');
 						$event->status = kEvent::erSUCCESS;
 					}
 					else {
 						$event->status = kEvent::erFAIL;
 						$event->redirect = false;
 						break;
 					}
 				}
 			}
 		}
 
 		/**
 		 * Delete's kDBItem object
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnDelete(kEvent $event)
 		{
 			if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
 				$event->status = kEvent::erFAIL;
 				return;
 			}
 
+			/** @var kTempTablesHandler $temp_handler */
 			$temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
-			/* @var $temp_handler kTempTablesHandler */
 
 			$temp_handler->DeleteItems($event->Prefix, $event->Special, Array ($this->getPassedID($event)));
 		}
 
 		/**
 		 * Deletes all records from table
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnDeleteAll(kEvent $event)
 		{
 			$config = $event->getUnitConfig();
 
 			$sql = 'SELECT ' . $config->getIDField() . '
 					FROM ' . $config->getTableName();
 			$ids = $this->Conn->GetCol($sql);
 
 			if ( $ids ) {
+				/** @var kTempTablesHandler $temp_handler */
 				$temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
-				/* @var $temp_handler kTempTablesHandler */
 
 				$temp_handler->DeleteItems($event->Prefix, $event->Special, $ids);
 			}
 		}
 
 		/**
 		 * Prepares new kDBItem object
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnNew(kEvent $event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject(Array ('skip_autoload' => true));
-			/* @var $object kDBItem */
 
 			$object->Clear(0);
 			$this->Application->SetVar($event->getPrefixSpecial() . '_SaveEvent', 'OnCreate');
 
 			if ( $event->getEventParam('top_prefix') != $event->Prefix ) {
 				// this is subitem prefix, so use main item special
 				$table_info = $object->getLinkedInfo($this->getMainSpecial($event));
 			}
 			else {
 				$table_info = $object->getLinkedInfo();
 			}
 
 			$object->SetDBField($table_info['ForeignKey'], $table_info['ParentId']);
 
 			$event->redirect = false;
 		}
 
 		/**
 		 * Cancels kDBItem Editing/Creation
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnCancel(kEvent $event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject(Array ('skip_autoload' => true));
-			/* @var $object kDBItem */
 
 			$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
 
 			if ( $items_info ) {
 				$delete_ids = Array ();
 
+				/** @var kTempTablesHandler $temp_handler */
 				$temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
-				/* @var $temp_handler kTempTablesHandler */
 
 				foreach ($items_info as $id => $field_values) {
 					$object->Load($id);
 					// record created for using with selector (e.g. Reviews->Select User), and not validated => Delete it
 					if ( $object->isLoaded() && !$object->Validate() && ($id <= 0) ) {
 						$delete_ids[] = $id;
 					}
 				}
 
 				if ( $delete_ids ) {
 					$temp_handler->DeleteItems($event->Prefix, $event->Special, $delete_ids);
 				}
 			}
 
 			$event->SetRedirectParam('opener', 'u');
 		}
 
 		/**
 		 * Deletes all selected items.
 		 * Automatically recurse into sub-items using temp handler, and deletes sub-items
 		 * by calling its Delete method if sub-item has AutoDelete set to true in its config file
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnMassDelete(kEvent $event)
 		{
 			if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
 				$event->status = kEvent::erFAIL;
 				return ;
 			}
 
+			/** @var kTempTablesHandler $temp_handler */
 			$temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
-			/* @var $temp_handler kTempTablesHandler */
 
 			$ids = $this->StoreSelectedIDs($event);
 
 			$event->setEventParam('ids', $ids);
 			$this->customProcessing($event, 'before');
 			$ids = $event->getEventParam('ids');
 
 			if ( $ids ) {
 				$temp_handler->DeleteItems($event->Prefix, $event->Special, $ids);
 			}
 
 			$this->clearSelectedIDs($event);
 		}
 
 		/**
 		 * Sets window id (of first opened edit window) to temp mark in uls
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function setTempWindowID(kEvent $event)
 		{
 			$prefixes = Array ($event->Prefix, $event->getPrefixSpecial(true));
 
 			foreach ($prefixes as $prefix) {
 				$mode = $this->Application->GetVar($prefix . '_mode');
 
 				if ($mode == 't') {
 					$wid = $this->Application->GetVar('m_wid');
 					$this->Application->SetVar(str_replace('_', '.', $prefix) . '_mode', 't' . $wid);
 					break;
 				}
 			}
 		}
 
 		/**
 		 * Prepare temp tables and populate it
 		 * with items selected in the grid
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnEdit(kEvent $event)
 		{
 			$this->setTempWindowID($event);
 			$ids = $this->StoreSelectedIDs($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject(Array('skip_autoload' => true));
-			/* @var $object kDBItem */
 
 			$object->setPendingActions(null, true);
 
 			$changes_var_name = $this->Prefix . '_changes_' . $this->Application->GetTopmostWid($this->Prefix);
 			$this->Application->RemoveVar($changes_var_name);
 
+			/** @var kTempTablesHandler $temp_handler */
 			$temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
-			/* @var $temp_handler kTempTablesHandler */
 
 			$temp_handler->PrepareEdit();
 
 			$event->SetRedirectParam('m_lang', $this->Application->GetDefaultLanguageId());
 			$event->SetRedirectParam($event->getPrefixSpecial() . '_id', array_shift($ids));
 			$event->SetRedirectParam('pass', 'all,' . $event->getPrefixSpecial());
 
 			$simultaneous_edit_message = $this->Application->GetVar('_simultaneous_edit_message');
 
 			if ( $simultaneous_edit_message ) {
 				$event->SetRedirectParam('_simultaneous_edit_message', $simultaneous_edit_message);
 			}
 		}
 
 		/**
 		 * Saves content of temp table into live and
 		 * redirects to event' default redirect (normally grid template)
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnSave(kEvent $event)
 		{
 			$event->CallSubEvent('OnPreSave');
 
 			if ( $event->status != kEvent::erSUCCESS ) {
 				return;
 			}
 
 			$skip_master = false;
+
+			/** @var kTempTablesHandler $temp_handler */
 			$temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
-			/* @var $temp_handler kTempTablesHandler */
 
 			$changes_var_name = $this->Prefix . '_changes_' . $this->Application->GetTopmostWid($this->Prefix);
 
 			if ( !$this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
 				$live_ids = $temp_handler->SaveEdit($event->getEventParam('master_ids') ? $event->getEventParam('master_ids') : Array ());
 
 				if ( $live_ids === false ) {
 					// coping from table failed, because we have another coping process to same table, that wasn't finished
 					$event->status = kEvent::erFAIL;
 					return;
 				}
 
 				if ( $live_ids ) {
 					// ensure, that newly created item ids are available as if they were selected from grid
 					// NOTE: only works if main item has sub-items !!!
 					$this->StoreSelectedIDs($event, $live_ids);
 				}
 
+				/** @var kDBItem $object */
 				$object = $event->getObject();
-				/* @var $object kDBItem */
 
 				$this->SaveLoggedChanges($changes_var_name, $object->ShouldLogChanges());
 			}
 			else {
 				$event->status = kEvent::erFAIL;
 			}
 
 			$this->clearSelectedIDs($event);
 
 			$event->SetRedirectParam('opener', 'u');
 			$this->Application->RemoveVar($event->getPrefixSpecial() . '_modified');
 
 			// all temp tables are deleted here => all after hooks should think, that it's live mode now
 			$this->Application->SetVar($event->Prefix . '_mode', '');
 		}
 
 		/**
 		 * Saves changes made in temporary table to log
 		 *
 		 * @param string $changes_var_name
 		 * @param bool $save
 		 * @return void
 		 * @access public
 		 */
 		public function SaveLoggedChanges($changes_var_name, $save = true)
 		{
 			// 1. get changes, that were made
 			$changes = $this->Application->RecallVar($changes_var_name);
 			$changes = $changes ? unserialize($changes) : Array ();
 			$this->Application->RemoveVar($changes_var_name);
 
 			if (!$changes) {
 				// no changes, skip processing
 				return ;
 			}
 
 			// TODO: 2. optimize change log records (replace multiple changes to same record with one change record)
 
 			$to_increment = Array ();
 
 			// 3. collect serials to reset based on foreign keys
 			foreach ($changes as $index => $rec) {
 				if (array_key_exists('DependentFields', $rec)) {
 
 					foreach ($rec['DependentFields'] as $field_name => $field_value) {
 						// will be "ci|ItemResourceId:345"
 						$to_increment[] = $rec['Prefix'] . '|' . $field_name . ':' . $field_value;
 
 						// also reset sub-item prefix general serial
 						$to_increment[] = $rec['Prefix'];
 					}
 
 					unset($changes[$index]['DependentFields']);
 				}
 
 				unset($changes[$index]['ParentId'], $changes[$index]['ParentPrefix']);
 			}
 
 			// 4. collect serials to reset based on changed ids
 			foreach ($changes as $change) {
 				$to_increment[] = $change['MasterPrefix'] . '|' . $change['MasterId'];
 
 				if ($change['MasterPrefix'] != $change['Prefix']) {
 					// also reset sub-item prefix general serial
 					$to_increment[] = $change['Prefix'];
 
 					// will be "ci|ItemResourceId"
 					$to_increment[] = $change['Prefix'] . '|' . $change['ItemId'];
 				}
 			}
 
 			// 5. reset serials collected before
 			$to_increment = array_unique($to_increment);
 			$this->Application->incrementCacheSerial($this->Prefix);
 
 			foreach ($to_increment as $to_increment_mixed) {
 				if (strpos($to_increment_mixed, '|') !== false) {
 					list ($to_increment_prefix, $to_increment_id) = explode('|', $to_increment_mixed, 2);
 					$this->Application->incrementCacheSerial($to_increment_prefix, $to_increment_id);
 				}
 				else {
 					$this->Application->incrementCacheSerial($to_increment_mixed);
 				}
 			}
 
 			// save changes to database
 			$session_log_id = $this->Application->RecallVar('_SessionLogId_');
 
 			if (!$save || !$session_log_id) {
 				// saving changes to database disabled OR related session log missing
 				return ;
 			}
 
 			$add_fields = Array (
 				'PortalUserId' => $this->Application->RecallVar('user_id'),
 				'SessionLogId' => $session_log_id,
 			);
 
 			$change_log_table = $this->Application->getUnitConfig('change-log')->getTableName();
 
 			foreach ($changes as $rec) {
 				$this->Conn->doInsert(array_merge($rec, $add_fields), $change_log_table);
 			}
 
 			$this->Application->incrementCacheSerial('change-log');
 
 			$sql = 'UPDATE ' . $this->Application->getUnitConfig('session-log')->getTableName() . '
 					SET AffectedItems = AffectedItems + ' . count($changes) . '
 					WHERE SessionLogId = ' . $session_log_id;
 			$this->Conn->Query($sql);
 
 			$this->Application->incrementCacheSerial('session-log');
 		}
 
 		/**
 		 * Cancels edit
 		 * Removes all temp tables and clears selected ids
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnCancelEdit(kEvent $event)
 		{
+			/** @var kTempTablesHandler $temp_handler */
 			$temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
-			/* @var $temp_handler kTempTablesHandler */
 
 			$temp_handler->CancelEdit();
 			$this->clearSelectedIDs($event);
 
 			$this->Application->RemoveVar($event->getPrefixSpecial() . '_modified');
 
 			$changes_var_name = $this->Prefix . '_changes_' . $this->Application->GetTopmostWid($this->Prefix);
 			$this->Application->RemoveVar($changes_var_name);
 
 			$event->SetRedirectParam('opener', 'u');
 		}
 
 		/**
 		 * Allows to determine if we are creating new item or editing already created item
 		 *
 		 * @param kEvent $event
 		 * @return bool
 		 * @access public
 		 */
 		public function isNewItemCreate(kEvent $event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject( Array ('raise_warnings' => 0) );
-			/* @var $object kDBItem */
 
 			return !$object->isLoaded();
 		}
 
 		/**
 		 * Saves edited item into temp table
 		 * If there is no id, new item is created in temp table
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnPreSave(kEvent $event)
 		{
 			// if there is no id - it means we need to create an item
 			if ( is_object($event->MasterEvent) ) {
 				$event->MasterEvent->setEventParam('IsNew', false);
 			}
 
 			if ( $this->isNewItemCreate($event) ) {
 				$event->CallSubEvent('OnPreSaveCreated');
 
 				if ( is_object($event->MasterEvent) ) {
 					$event->MasterEvent->setEventParam('IsNew', true);
 				}
 
 				return ;
 			}
 
 			// don't just call OnUpdate event here, since it maybe overwritten to Front-End specific behavior
 			$this->_update($event);
 		}
 
 		/**
 		 * Analog of OnPreSave event for usage in AJAX request
 		 *
 		 * @param kEvent $event
 		 *
 		 * @return void
 		 */
 		protected function OnPreSaveAjax(kEvent $event)
 		{
+			/** @var AjaxFormHelper $ajax_form_helper */
 			$ajax_form_helper = $this->Application->recallObject('AjaxFormHelper');
-			/* @var $ajax_form_helper AjaxFormHelper */
 
 			$ajax_form_helper->transitEvent($event, 'OnPreSave');
 		}
 
 		/**
 		 * [HOOK] Saves sub-item
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnPreSaveSubItem(kEvent $event)
 		{
 			$not_created = $this->isNewItemCreate($event);
 
 			$event->CallSubEvent($not_created ? 'OnCreate' : 'OnUpdate');
 			if ( $event->status == kEvent::erSUCCESS ) {
+				/** @var kDBItem $object */
 				$object = $event->getObject();
-				/* @var $object kDBItem */
 
 				$this->Application->SetVar($event->getPrefixSpecial() . '_id', $object->GetID());
 			}
 			else {
 				$event->MasterEvent->status = $event->status;
 			}
 
 			$event->SetRedirectParam('opener', 's');
 		}
 
 		/**
 		 * Saves edited item in temp table and loads
 		 * item with passed id in current template
 		 * Used in Prev/Next buttons
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnPreSaveAndGo(kEvent $event)
 		{
 			$event->CallSubEvent('OnPreSave');
 
 			if ( $event->status == kEvent::erSUCCESS ) {
 				$id = $this->Application->GetVar($event->getPrefixSpecial(true) . '_GoId');
 				$event->SetRedirectParam($event->getPrefixSpecial() . '_id', $id);
 			}
 		}
 
 		/**
 		 * Saves edited item in temp table and goes
 		 * to passed tabs, by redirecting to it with OnPreSave event
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnPreSaveAndGoToTab(kEvent $event)
 		{
 			$event->CallSubEvent('OnPreSave');
 
 			if ( $event->status == kEvent::erSUCCESS ) {
 				$event->redirect = $this->Application->GetVar($event->getPrefixSpecial(true) . '_GoTab');
 			}
 		}
 
 		/**
 		 * Saves editable list and goes to passed tab,
 		 * by redirecting to it with empty event
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnUpdateAndGoToTab(kEvent $event)
 		{
 			$event->setPseudoClass('_List');
 			$event->CallSubEvent('OnUpdate');
 
 			if ( $event->status == kEvent::erSUCCESS ) {
 				$event->redirect = $this->Application->GetVar($event->getPrefixSpecial(true) . '_GoTab');
 			}
 		}
 
 		/**
 		 * Prepare temp tables for creating new item
 		 * but does not create it. Actual create is
 		 * done in OnPreSaveCreated
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnPreCreate(kEvent $event)
 		{
 			$this->setTempWindowID($event);
 			$this->clearSelectedIDs($event);
 			$this->Application->SetVar('m_lang', $this->Application->GetDefaultLanguageId());
 
+			/** @var kDBItem $object */
 			$object = $event->getObject(Array ('skip_autoload' => true));
-			/* @var $object kDBItem */
 
+			/** @var kTempTablesHandler $temp_handler */
 			$temp_handler = $this->Application->recallObject($event->Prefix . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
-			/* @var $temp_handler kTempTablesHandler */
 
 			$temp_handler->PrepareEdit();
 
 			$object->setID(0);
 			$this->Application->SetVar($event->getPrefixSpecial() . '_id', 0);
 			$this->Application->SetVar($event->getPrefixSpecial() . '_PreCreate', 1);
 
 			$changes_var_name = $this->Prefix . '_changes_' . $this->Application->GetTopmostWid($this->Prefix);
 			$this->Application->RemoveVar($changes_var_name);
 
 			$event->redirect = false;
 		}
 
 		/**
 		 * Creates a new item in temp table and
 		 * stores item id in App vars and Session on success
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnPreSaveCreated(kEvent $event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject( Array('skip_autoload' => true) );
-			/* @var $object kDBItem */
 
 			$object->setID(0);
 			$field_values = $this->getSubmittedFields($event);
 			$object->SetFieldsFromHash($field_values);
 			$event->setEventParam('form_data', $field_values);
 			$this->customProcessing($event, 'before');
 
 			if ( $object->Create() ) {
 				$this->customProcessing($event, 'after');
 				$event->SetRedirectParam($event->getPrefixSpecial(true) . '_id', $object->GetID());
 			}
 			else {
 				$event->status = kEvent::erFAIL;
 				$event->redirect = false;
 			}
 		}
 
 		/**
 		 * Reloads form to loose all changes made during item editing
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnReset(kEvent $event)
 		{
 			//do nothing - should reset :)
 			if ( $this->isNewItemCreate($event) ) {
 				// just reset id to 0 in case it was create
+				/** @var kDBItem $object */
 				$object = $event->getObject( Array ('skip_autoload' => true) );
-				/* @var $object kDBItem */
 
 				$object->setID(0);
 				$this->Application->SetVar($event->getPrefixSpecial() . '_id', 0);
 			}
 		}
 
 		/**
 		 * Apply same processing to each item being selected in grid
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function iterateItems(kEvent $event)
 		{
 			if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
 				$event->status = kEvent::erFAIL;
 				return ;
 			}
 
+			/** @var kDBItem $object */
 			$object = $event->getObject(Array ('skip_autoload' => true));
-			/* @var $object kDBItem */
 
 			$ids = $this->StoreSelectedIDs($event);
 
 			if ( $ids ) {
 				$config = $event->getUnitConfig();
 				$status_field = $config->getStatusField(true);
 				$order_field = $config->getOrderField();
 
 				if ( !$order_field ) {
 					$order_field = 'Priority';
 				}
 
 				foreach ($ids as $id) {
 					$object->Load($id);
 
 					switch ( $event->Name ) {
 						case 'OnMassApprove':
 							$object->SetDBField($status_field, 1);
 							break;
 
 						case 'OnMassDecline':
 							$object->SetDBField($status_field, 0);
 							break;
 
 						case 'OnMassMoveUp':
 							$object->SetDBField($order_field, $object->GetDBField($order_field) + 1);
 							break;
 
 						case 'OnMassMoveDown':
 							$object->SetDBField($order_field, $object->GetDBField($order_field) - 1);
 							break;
 					}
 
 					$object->Update();
 				}
 			}
 
 			$this->clearSelectedIDs($event);
 		}
 
 		/**
 		 * Clones selected items in list
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnMassClone(kEvent $event)
 		{
 			if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
 				$event->status = kEvent::erFAIL;
 				return;
 			}
 
+			/** @var kTempTablesHandler $temp_handler */
 			$temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
-			/* @var $temp_handler kTempTablesHandler */
 
 			$ids = $this->StoreSelectedIDs($event);
 
 			if ( $ids ) {
 				$temp_handler->CloneItems($event->Prefix, $event->Special, $ids);
 			}
 
 			$this->clearSelectedIDs($event);
 		}
 
 		/**
 		 * Checks if given value is present in given array
 		 *
 		 * @param Array $records
 		 * @param string $field
 		 * @param mixed $value
 		 * @return bool
 		 * @access protected
 		 */
 		protected function check_array($records, $field, $value)
 		{
 			foreach ($records as $record) {
 				if ($record[$field] == $value) {
 					return true;
 				}
 			}
 
 			return false;
 		}
 
 		/**
 		 * Saves data from editing form to database without checking required fields
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnPreSavePopup(kEvent $event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$this->RemoveRequiredFields($object);
 			$event->CallSubEvent('OnPreSave');
 
 			$event->SetRedirectParam('opener', 'u');
 		}
 
 /* End of Edit events */
 
 		// III. Events that allow to put some code before and after Update,Load,Create and Delete methods of item
 
 		/**
 		 * Occurs before loading item, 'id' parameter
 		 * allows to get id of item being loaded
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemLoad(kEvent $event)
 		{
 
 		}
 
 		/**
 		 * Occurs after loading item, 'id' parameter
 		 * allows to get id of item that was loaded
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemLoad(kEvent $event)
 		{
 
 		}
 
 		/**
 		 * Occurs before creating item
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemCreate(kEvent $event)
 		{
 
 		}
 
 		/**
 		 * Occurs after creating item
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemCreate(kEvent $event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			if ( !$object->IsTempTable() ) {
 				$this->_processPendingActions($event);
 			}
 		}
 
 		/**
 		 * Occurs before updating item
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemUpdate(kEvent $event)
 		{
 
 		}
 
 		/**
 		 * Occurs after updating item
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemUpdate(kEvent $event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			if ( !$object->IsTempTable() ) {
 				$this->_processPendingActions($event);
 			}
 		}
 
 		/**
 		 * Occurs before deleting item, id of item being
 		 * deleted is stored as 'id' event param
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemDelete(kEvent $event)
 		{
 
 		}
 
 		/**
 		 * Occurs after deleting item, id of deleted item
 		 * is stored as 'id' param of event
 		 *
 		 * Also deletes subscriptions to that particual item once it's deleted
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemDelete(kEvent $event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			// 1. delete direct subscriptions to item, that was deleted
 			$this->_deleteSubscriptions($event->Prefix, 'ItemId', $object->GetID());
 
 			// 2. delete this item sub-items subscriptions, that reference item, that was deleted
 			foreach ($event->getUnitConfig()->getSubItems(Array ()) as $sub_prefix) {
 				$this->_deleteSubscriptions($sub_prefix, 'ParentItemId', $object->GetID());
 			}
 		}
 
 		/**
 		 * Deletes all subscriptions, associated with given item
 		 *
 		 * @param string $prefix
 		 * @param string $field
 		 * @param int $value
 		 * @return void
 		 * @access protected
 		 */
 		protected function _deleteSubscriptions($prefix, $field, $value)
 		{
 			$sql = 'SELECT TemplateId
 					FROM ' . $this->Application->getUnitConfig('email-template')->getTableName() . '
 					WHERE BindToSystemEvent REGEXP "' . $this->Conn->escape($prefix) . '(\\\\.[^:]*:.*|:.*)"';
 			$email_template_ids = $this->Conn->GetCol($sql);
 
 			if ( !$email_template_ids ) {
 				return;
 			}
 
 			// e-mail events, connected to that unit prefix are found
 			$sql = 'SELECT SubscriptionId
 					FROM ' . TABLE_PREFIX . 'SystemEventSubscriptions
 					WHERE ' . $field . ' = ' . $value . ' AND EmailTemplateId IN (' . implode(',', $email_template_ids) . ')';
 			$ids = $this->Conn->GetCol($sql);
 
 			if ( !$ids ) {
 				return;
 			}
 
+			/** @var kTempTablesHandler $temp_handler */
 			$temp_handler = $this->Application->recallObject('system-event-subscription_TempHandler', 'kTempTablesHandler');
-			/* @var $temp_handler kTempTablesHandler */
 
 			$temp_handler->DeleteItems('system-event-subscription', '', $ids);
 		}
 
 		/**
 		 * Occurs before validation attempt
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemValidate(kEvent $event)
 		{
 
 		}
 
 		/**
 		 * Occurs after successful item validation
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemValidate(kEvent $event)
 		{
 
 		}
 
 		/**
 		 * Occurs after an item has been copied to temp
 		 * Id of copied item is passed as event' 'id' param
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterCopyToTemp(kEvent $event)
 		{
 
 		}
 
 		/**
 		 * Occurs before an item is deleted from live table when copying from temp
 		 * (temp handler deleted all items from live and then copy over all items from temp)
 		 * Id of item being deleted is passed as event' 'id' param
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeDeleteFromLive(kEvent $event)
 		{
 
 		}
 
 		/**
 		 * Occurs before an item is copied to live table (after all foreign keys have been updated)
 		 * Id of item being copied is passed as event' 'id' param
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeCopyToLive(kEvent $event)
 		{
 
 		}
 
 		/**
 		 * Occurs after an item has been copied to live table
 		 * Id of copied item is passed as event' 'id' param
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterCopyToLive(kEvent $event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject(array('skip_autoload' => true));
-			/* @var $object kDBItem */
 
 			$object->SwitchToLive();
 			$object->Load($event->getEventParam('id'));
 
 			$this->_processPendingActions($event);
 		}
 
 		/**
 		 * Processing file pending actions (e.g. delete scheduled files)
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function _processPendingActions(kEvent $event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$update_required = false;
 			$temp_id = $event->getEventParam('temp_id');
 			$id = $temp_id !== false ? $temp_id : $object->GetID();
 
 			foreach ($object->getPendingActions($id) as $data) {
 				switch ( $data['action'] ) {
 					case 'delete':
 						unlink($data['file']);
 						break;
 
 					case 'make_live':
+						/** @var FileHelper $file_helper */
 						$file_helper = $this->Application->recallObject('FileHelper');
-						/* @var $file_helper FileHelper */
 
 						if ( !file_exists($data['file']) ) {
 							// file removal was requested too
 							continue;
 						}
 
 						$old_name = basename($data['file']);
 						$new_name = $file_helper->ensureUniqueFilename(dirname($data['file']), kUtil::removeTempExtension($old_name));
 						rename($data['file'], dirname($data['file']) . '/' . $new_name);
 
 						$db_value = $object->GetDBField($data['field']);
 						$object->SetDBField($data['field'], str_replace($old_name, $new_name, $db_value));
 						$update_required = true;
 						break;
 
 					default:
 						trigger_error('Unsupported pending action "' . $data['action'] . '" for "' . $event->getPrefixSpecial() . '" unit', E_USER_WARNING);
 						break;
 				}
 			}
 
 			// remove pending actions before updating to prevent recursion
 			$object->setPendingActions();
 
 			if ( $update_required ) {
 				$object->Update();
 			}
 		}
 
 		/**
 		 * Occurs before an item has been cloned
 		 * Id of newly created item is passed as event' 'id' param
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeClone(kEvent $event)
 		{
 
 		}
 
 		/**
 		 * Occurs after an item has been cloned
 		 * Id of newly created item is passed as event' 'id' param
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterClone(kEvent $event)
 		{
 
 		}
 
 		/**
 		 * Occurs after list is queried
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterListQuery(kEvent $event)
 		{
 
 		}
 
 		/**
 		 * Ensures that popup will be closed automatically
 		 * and parent window will be refreshed with template
 		 * passed
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 * @deprecated
 		 */
 		protected function finalizePopup(kEvent $event)
 		{
 			$event->SetRedirectParam('opener', 'u');
 		}
 
 		/**
 		 * Create search filters based on search query
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnSearch(kEvent $event)
 		{
 			$event->setPseudoClass('_List');
 
+			/** @var kSearchHelper $search_helper */
 			$search_helper = $this->Application->recallObject('SearchHelper');
-			/* @var $search_helper kSearchHelper */
 
 			$search_helper->performSearch($event);
 		}
 
 		/**
 		 * Clear search keywords
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnSearchReset(kEvent $event)
 		{
+			/** @var kSearchHelper $search_helper */
 			$search_helper = $this->Application->recallObject('SearchHelper');
-			/* @var $search_helper kSearchHelper */
 
 			$search_helper->resetSearch($event);
 		}
 
 		/**
 		 * Set's new filter value (filter_id meaning from config)
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 * @deprecated
 		 */
 		protected function OnSetFilter(kEvent $event)
 		{
 			$filter_id = $this->Application->GetVar('filter_id');
 			$filter_value = $this->Application->GetVar('filter_value');
 
 			$view_filter = $this->Application->RecallVar($event->getPrefixSpecial() . '_view_filter');
 			$view_filter = $view_filter ? unserialize($view_filter) : Array ();
 
 			$view_filter[$filter_id] = $filter_value;
 
 			$this->Application->StoreVar($event->getPrefixSpecial() . '_view_filter', serialize($view_filter));
 		}
 
 		/**
 		 * Sets view filter based on request
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnSetFilterPattern(kEvent $event)
 		{
 			$filters = $this->Application->GetVar($event->getPrefixSpecial(true) . '_filters');
 			if ( !$filters ) {
 				return;
 			}
 
 			$view_filter = $this->Application->RecallVar($event->getPrefixSpecial() . '_view_filter');
 			$view_filter = $view_filter ? unserialize($view_filter) : Array ();
 
 			$filters = explode(',', $filters);
 
 			foreach ($filters as $a_filter) {
 				list($id, $value) = explode('=', $a_filter);
 				$view_filter[$id] = $value;
 			}
 
 			$this->Application->StoreVar($event->getPrefixSpecial() . '_view_filter', serialize($view_filter));
 			$event->redirect = false;
 		}
 
 		/**
 		 * Add/Remove all filters applied to list from "View" menu
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function FilterAction(kEvent $event)
 		{
 			$view_filter = Array ();
 			$filter_menu = $event->getUnitConfig()->getFilterMenu();
 
 			switch ($event->Name) {
 				case 'OnRemoveFilters':
 					$filter_value = 1;
 					break;
 
 				case 'OnApplyFilters':
 					$filter_value = 0;
 					break;
 
 				default:
 					$filter_value = 0;
 					break;
 			}
 
 			foreach ($filter_menu['Filters'] as $filter_key => $filter_params) {
 				if ( !$filter_params ) {
 					continue;
 				}
 
 				$view_filter[$filter_key] = $filter_value;
 			}
 
 			$this->Application->StoreVar($event->getPrefixSpecial() . '_view_filter', serialize($view_filter));
 		}
 
 		/**
 		 * Enter description here...
 		 *
 		 * @param kEvent $event
 		 * @access protected
 		 */
 		protected function OnPreSaveAndOpenTranslator(kEvent $event)
 		{
 			$this->Application->SetVar('allow_translation', true);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$this->RemoveRequiredFields($object);
 			$event->CallSubEvent('OnPreSave');
 
 			if ( $event->status == kEvent::erSUCCESS ) {
 				$resource_id = $this->Application->GetVar('translator_resource_id');
 
 				if ( $resource_id ) {
 					$t_prefixes = explode(',', $this->Application->GetVar('translator_prefixes'));
 
+					/** @var kDBItem $cdata */
 					$cdata = $this->Application->recallObject($t_prefixes[1], NULL, Array ('skip_autoload' => true));
-					/* @var $cdata kDBItem */
 
 					$cdata->Load($resource_id, 'ResourceId');
 
 					if ( !$cdata->isLoaded() ) {
 						$cdata->SetDBField('ResourceId', $resource_id);
 						$cdata->Create();
 					}
 
 					$this->Application->SetVar($cdata->getPrefixSpecial() . '_id', $cdata->GetID());
 				}
 
 				$event->redirect = $this->Application->GetVar('translator_t');
 
 				$redirect_params = Array (
 					'pass' => 'all,trans,' . $this->Application->GetVar('translator_prefixes'),
 					'opener' => 's',
 					$event->getPrefixSpecial(true) . '_id' => $object->GetID(),
 					'trans_event'		=>	'OnLoad',
 					'trans_prefix'		=>	$this->Application->GetVar('translator_prefixes'),
 					'trans_field' 		=>	$this->Application->GetVar('translator_field'),
 					'trans_multi_line'	=>	$this->Application->GetVar('translator_multi_line'),
 				);
 
 				$event->setRedirectParams($redirect_params);
 
 				// 1. SAVE LAST TEMPLATE TO SESSION (really needed here, because of tweaky redirect)
 				$last_template = $this->Application->RecallVar('last_template');
 				preg_match('/index4\.php\|' . $this->Application->GetSID() . '-(.*):/U', $last_template, $rets);
 				$this->Application->StoreVar('return_template', $this->Application->GetVar('t'));
 			}
 		}
 
 		/**
 		 * Makes all fields non-required
 		 *
 		 * @param kDBItem $object
 		 * @return void
 		 * @access protected
 		 */
 		protected function RemoveRequiredFields(&$object)
 		{
 			// making all field non-required to achieve successful presave
 			$fields = array_keys( $object->getFields() );
 
 			foreach ($fields as $field) {
 				if ( $object->isRequired($field) ) {
 					$object->setRequired($field, false);
 				}
 			}
 		}
 
 		/**
 		 * Saves selected user in needed field
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnSelectUser(kEvent $event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$items_info = $this->Application->GetVar('u');
 
 			if ( $items_info ) {
 				list ($user_id, ) = each($items_info);
 				$this->RemoveRequiredFields($object);
 
 				$is_new = !$object->isLoaded();
 				$is_main = substr($this->Application->GetVar($event->Prefix . '_mode'), 0, 1) == 't';
 
 				if ( $is_new ) {
 					$new_event = $is_main ? 'OnPreCreate' : 'OnNew';
 					$event->CallSubEvent($new_event);
 					$event->redirect = true;
 				}
 
 				$object->SetDBField($this->Application->RecallVar('dst_field'), $user_id);
 
 				if ( $is_new ) {
 					$object->Create();
 				}
 				else {
 					$object->Update();
 				}
 			}
 
 			$event->SetRedirectParam($event->getPrefixSpecial() . '_id', $object->GetID());
 			$event->SetRedirectParam('opener', 'u');
 		}
 
 /** EXPORT RELATED **/
 
 		/**
 		 * Shows export dialog
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnExport(kEvent $event)
 		{
 			$selected_ids = $this->StoreSelectedIDs($event);
 
 			if ( implode(',', $selected_ids) == '' ) {
 				// K4 fix when no ids found bad selected ids array is formed
 				$selected_ids = false;
 			}
 
 			$this->Application->StoreVar($event->Prefix . '_export_ids', $selected_ids ? implode(',', $selected_ids) : '');
 
 			$this->Application->LinkVar('export_finish_t');
 			$this->Application->LinkVar('export_progress_t');
 			$this->Application->StoreVar('export_special', $event->Special);
 			$this->Application->StoreVar('export_grid', $this->Application->GetVar('grid', 'Default'));
 
 			$redirect_params = Array (
 				$this->Prefix . '.export_event' => 'OnNew',
 				'pass' => 'all,' . $this->Prefix . '.export'
 			);
 
 			$event->setRedirectParams($redirect_params);
 		}
 
 		/**
 		 * Apply some special processing to object being
 		 * recalled before using it in other events that
 		 * call prepareObject
 		 *
 		 * @param kDBItem|kDBList $object
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function prepareObject(&$object, kEvent $event)
 		{
 			if ( $event->Special == 'export' || $event->Special == 'import' ) {
+				/** @var kCatDBItemExportHelper $export_helper */
 				$export_helper = $this->Application->recallObject('CatItemExportHelper');
-				/* @var $export_helper kCatDBItemExportHelper */
 
 				$export_helper->prepareExportColumns($event);
 			}
 		}
 
 		/**
 		 * Returns specific to each item type columns only
 		 *
 		 * @param kEvent $event
 		 * @return Array
 		 * @access public
 		 */
 		public function getCustomExportColumns(kEvent $event)
 		{
 			return Array ();
 		}
 
 		/**
 		 * Export form validation & processing
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnExportBegin(kEvent $event)
 		{
+			/** @var kCatDBItemExportHelper $export_helper */
 			$export_helper = $this->Application->recallObject('CatItemExportHelper');
-			/* @var $export_helper kCatDBItemExportHelper */
 
 			$export_helper->OnExportBegin($event);
 		}
 
 		/**
 		 * Enter description here...
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnExportCancel(kEvent $event)
 		{
 			$this->OnGoBack($event);
 		}
 
 		/**
 		 * Allows configuring export options
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeExportBegin(kEvent $event)
 		{
 
 		}
 
 		/**
 		 * Deletes export preset
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnDeleteExportPreset(kEvent $event)
 		{
 			$field_values = $this->getSubmittedFields($event);
 
 			if ( !$field_values ) {
 				return ;
 			}
 
 			$preset_key = $field_values['ExportPresets'];
 			$export_settings = $this->Application->RecallPersistentVar('export_settings');
 
 			if ( !$export_settings ) {
 				return ;
 			}
 
 			$export_settings = unserialize($export_settings);
 
 			if ( !isset($export_settings[$event->Prefix]) ) {
 				return ;
 			}
 
 			$to_delete = '';
 
 			foreach ($export_settings[$event->Prefix] as $key => $val) {
 				if ( implode('|', $val['ExportColumns']) == $preset_key ) {
 					$to_delete = $key;
 					break;
 				}
 			}
 
 			if ( $to_delete ) {
 				unset($export_settings[$event->Prefix][$to_delete]);
 				$this->Application->StorePersistentVar('export_settings', serialize($export_settings));
 			}
 		}
 
 		/**
 		 * Saves changes & changes language
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnPreSaveAndChangeLanguage(kEvent $event)
 		{
 			if ( $this->UseTempTables($event) ) {
 				$event->CallSubEvent('OnPreSave');
 			}
 
 			if ( $event->status == kEvent::erSUCCESS ) {
 				$this->Application->SetVar('m_lang', $this->Application->GetVar('language'));
 
 				$data = $this->Application->GetVar('st_id');
 
 				if ( $data ) {
 					$event->SetRedirectParam('st_id', $data);
 				}
 			}
 		}
 
 		/**
 		 * Used to save files uploaded via Plupload
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnUploadFile(kEvent $event)
 		{
 			$event->status = kEvent::erSTOP;
 
 			/** @var kUploadHelper $upload_helper */
 			$upload_helper = $this->Application->recallObject('kUploadHelper');
 
 			try {
 				$filename = $upload_helper->handle($event);
 
 				$response = array(
 					'jsonrpc' => '2.0',
 					'status' => 'success',
 					'result' => $filename,
 				);
 			}
 			catch ( kUploaderException $e ) {
 				$response = array(
 					'jsonrpc' => '2.0',
 					'status' => 'error',
 					'error' => array('code' => $e->getCode(), 'message' => $e->getMessage()),
 				);
 			}
 
 			echo json_encode($response);
 		}
 
 		/**
 		 * Remembers, that file should be deleted on item's save from temp table
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnDeleteFile(kEvent $event)
 		{
 			$event->status = kEvent::erSTOP;
 			$field_id = $this->Application->GetVar('field_id');
 
 			if ( !preg_match_all('/\[([^\[\]]*)\]/', $field_id, $regs) ) {
 				return;
 			}
 
 			$field = $regs[1][1];
 			$record_id = $regs[1][0];
 
 			/** @var kUploadHelper $upload_helper */
 			$upload_helper = $this->Application->recallObject('kUploadHelper');
 			$object = $upload_helper->prepareUploadedFile($event, $field);
 
 			if ( !$object->GetDBField($field) ) {
 				return;
 			}
 
 			$pending_actions = $object->getPendingActions($record_id);
 
 			$pending_actions[] = Array (
 				'action' => 'delete',
 				'id' => $record_id,
 				'field' => $field,
 				'file' => $object->GetField($field, 'full_path'),
 			);
 
 			$object->setPendingActions($pending_actions, $record_id);
 		}
 
 		/**
 		 * Returns url for viewing uploaded file
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnViewFile(kEvent $event)
 		{
 			$event->status = kEvent::erSTOP;
 			$field = $this->Application->GetVar('field');
 
 			/** @var kUploadHelper $upload_helper */
 			$upload_helper = $this->Application->recallObject('kUploadHelper');
 			$object = $upload_helper->prepareUploadedFile($event, $field);
 
 			if ( !$object->GetDBField($field) ) {
 				return;
 			}
 
 			// get url to uploaded file
 			if ( $this->Application->GetVar('thumb') ) {
 				$url = $object->GetField($field, $object->GetFieldOption($field, 'thumb_format'));
 			}
 			else {
 				$url = $object->GetField($field, 'raw_url');
 			}
 
 			/** @var FileHelper $file_helper */
 			$file_helper = $this->Application->recallObject('FileHelper');
 			$path = $file_helper->urlToPath($url);
 
 			if ( !file_exists($path) ) {
 				exit;
 			}
 
 			header('Content-Length: ' . filesize($path));
 			$this->Application->setContentType(kUtil::mimeContentType($path), false);
 			header('Content-Disposition: inline; filename="' . kUtil::removeTempExtension($object->GetDBField($field)) . '"');
 
 			readfile($path);
 		}
 
 		/**
 		 * Validates MInput control fields
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnValidateMInputFields(kEvent $event)
 		{
+			/** @var MInputHelper $minput_helper */
 			$minput_helper = $this->Application->recallObject('MInputHelper');
-			/* @var $minput_helper MInputHelper */
 
 			$minput_helper->OnValidateMInputFields($event);
 		}
 
 		/**
 		 * Validates individual object field and returns the result
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnValidateField(kEvent $event)
 		{
 			$event->status = kEvent::erSTOP;
 			$field = $this->Application->GetVar('field');
 
 			if ( ($this->Application->GetVar('ajax') != 'yes') || !$field ) {
 				return;
 			}
 
+			/** @var kDBItem $object */
 			$object = $event->getObject(Array ('skip_autoload' => true));
-			/* @var $object kDBItem */
 
 			$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
 
 			if ( !$items_info ) {
 				return;
 			}
 
 			list ($id, $field_values) = each($items_info);
 			$object->Load($id);
 			$object->SetFieldsFromHash($field_values);
 			$event->setEventParam('form_data', $field_values);
 			$object->setID($id);
 
 			$response = Array ('status' => 'OK');
 
 			$event->CallSubEvent($object->isLoaded() ? 'OnBeforeItemUpdate' : 'OnBeforeItemCreate');
 
 			// validate all fields, since "Password_plain" field sets error to "Password" field, which is passed here
 			$error_field = $object->GetFieldOption($field, 'error_field', false, $field);
 
 			if ( !$object->Validate() && $object->GetErrorPseudo($error_field) ) {
 				$response['status'] = $object->GetErrorMsg($error_field, false);
 			}
 
+			/** @var AjaxFormHelper $ajax_form_helper */
 			$ajax_form_helper = $this->Application->recallObject('AjaxFormHelper');
-			/* @var $ajax_form_helper AjaxFormHelper */
 
 			$response['other_errors'] = $ajax_form_helper->getErrorMessages($object);
 			$response['uploader_info'] = $ajax_form_helper->getUploaderInfo($object, array_keys($field_values));
 
 			$event->status = kEvent::erSTOP; // since event's OnBefore... events can change this event status
 			echo json_encode($response);
 		}
 
 		/**
 		 * Returns auto-complete values for ajax-dropdown
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnSuggestValues(kEvent $event)
 		{
 			$event->status = kEvent::erSTOP;
 
 			$this->Application->XMLHeader();
 			$data = $this->getAutoCompleteSuggestions($event, $this->Application->GetVar('cur_value'));
 
 			echo '<suggestions>';
 
 			if ( kUtil::isAssoc($data) ) {
 				foreach ($data as $key => $title) {
 					echo '<item value="' . kUtil::escape($key, kUtil::ESCAPE_HTML) . '">' . kUtil::escape($title, kUtil::ESCAPE_HTML) . '</item>';
 				}
 			}
 			else {
 				foreach ($data as $title) {
 					echo '<item>' . kUtil::escape($title, kUtil::ESCAPE_HTML) . '</item>';
 				}
 			}
 
 			echo '</suggestions>';
 		}
 
 		/**
 		 * Returns auto-complete values for jQueryUI.AutoComplete
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnSuggestValuesJSON(kEvent $event)
 		{
 			$event->status = kEvent::erSTOP;
 
 			$data = $this->getAutoCompleteSuggestions($event, $this->Application->GetVar('term'));
 
 			if ( kUtil::isAssoc($data) ) {
 				$transformed_data = array();
 
 				foreach ($data as $key => $title) {
 					$transformed_data[] = array('value' => $key, 'label' => $title);
 				}
 
 				$data = $transformed_data;
 			}
 
 			echo json_encode($data);
 		}
 
 		/**
 		 * Prepares a suggestion list based on a given term.
 		 *
 		 * @param kEvent $event Event.
 		 * @param string $term Term.
 		 *
 		 * @return Array
 		 * @access protected
 		 */
 		protected function getAutoCompleteSuggestions(kEvent $event, $term)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$field = $this->Application->GetVar('field');
 
 			if ( !$field || !$term || !$object->isField($field) ) {
 				return array();
 			}
 
 			$limit = $this->Application->GetVar('limit');
 
 			if ( !$limit ) {
 				$limit = 20;
 			}
 
 			$sql = 'SELECT DISTINCT ' . $field . '
 					FROM ' . $event->getUnitConfig()->getTableName() . '
 					WHERE ' . $field . ' LIKE ' . $this->Conn->qstr($term . '%') . '
 					ORDER BY ' . $field . '
 					LIMIT 0,' . $limit;
 
 			return $this->Conn->GetCol($sql);
 		}
 
 		/**
 		 * Enter description here...
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnSaveWidths(kEvent $event)
 		{
 			$event->status = kEvent::erSTOP;
 
 //			$this->Application->setContentType('text/xml');
 
 			$picker_helper = new kColumnPickerHelper(
 				$event->getPrefixSpecial(),
 				$this->Application->GetVar('grid_name')
 			);
 
 			$picker_helper->saveWidths($this->Application->GetVar('widths'));
 
 			echo 'OK';
 		}
 
 		/**
 		 * Called from CSV import script after item fields
 		 * are set and validated, but before actual item create/update.
 		 * If event status is kEvent::erSUCCESS, line will be imported,
 		 * else it will not be imported but added to skipped lines
 		 * and displayed in the end of import.
 		 * Event status is preset from import script.
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeCSVLineImport(kEvent $event)
 		{
 			// abstract, for hooking
 		}
 
 		/**
 		 * [HOOK] Allows to add cloned subitem to given prefix
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnCloneSubItem(kEvent $event)
 		{
 			$sub_item_prefix = $event->Prefix . '-' . preg_replace('/^#/', '', $event->MasterEvent->Prefix);
 
 			$event->MasterEvent->getUnitConfig()->addClones(Array (
 				$sub_item_prefix => Array ('ParentPrefix' => $event->Prefix),
 			));
 		}
 
 		/**
 		 * Returns constrain for priority calculations
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @see PriorityEventHandler
 		 * @access protected
 		 */
 		protected function OnGetConstrainInfo(kEvent $event)
 		{
 			$event->setEventParam('constrain_info', Array ('', ''));
 		}
 	}
Index: branches/5.3.x/core/kernel/db/db_connection.php
===================================================================
--- branches/5.3.x/core/kernel/db/db_connection.php	(revision 16518)
+++ branches/5.3.x/core/kernel/db/db_connection.php	(revision 16519)
@@ -1,1415 +1,1415 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	/**
 	 * Multi database connection class
 	 *
 	 */
 	class kDBConnection extends kBase implements IDBConnection {
 
 		/**
 		 * Created connection handle
 		 *
 		 * @var mysqli
 		 * @access protected
 		 */
 		protected $connectionID;
 
 		/**
 		 * Remembers, that database connection was opened successfully
 		 *
 		 * @var bool
 		 * @access public
 		 */
 		public $connectionOpened = false;
 
 		/**
 		 * Connection parameters, that were used
 		 *
 		 * @var Array
 		 * @access protected
 		 */
 		protected $connectionParams = Array ('host' => '', 'user' => '', 'pass' => '', 'db' => '');
 
 		/**
 		 * Index of database server
 		 *
 		 * @var int
 		 * @access protected
 		 */
 		protected $serverIndex = 0;
 
 		/**
 		 * Handle of currently processed recordset
 		 *
 		 * @var mysqli_result
 		 * @access protected
 		 */
 		protected $queryID = null;
 
 		/**
 		 * Function to handle sql errors
 		 *
 		 * @var mixed
 		 * @access protected
 		 */
 		protected $errorHandler = '';
 
 		/**
 		 * Error code
 		 *
 		 * @var int
 		 * @access protected
 		 */
 		protected $errorCode = 0;
 
 		/**
 		 * Error message
 		 *
 		 * @var string
 		 * @access protected
 		 */
 		protected $errorMessage = '';
 
 		/**
 		 * Defines if database connection
 		 * operations should generate debug
 		 * information
 		 *
 		 * @var bool
 		 * @access public
 		 */
 		public $debugMode = false;
 
 		/**
 		 * Save query execution statistics
 		 *
 		 * @var bool
 		 * @access protected
 		 */
 		protected $_captureStatistics = false;
 
 		/**
 		 * Last query to database
 		 *
 		 * @var string
 		 * @access public
 		 */
 		public $lastQuery = '';
 
 		/**
 		 * Total processed queries count
 		 *
 		 * @var int
 		 * @access protected
 		 */
 		protected $_queryCount = 0;
 
 		/**
 		 * Total time, used for serving queries
 		 *
 		 * @var Array
 		 * @access protected
 		 */
 		protected $_queryTime = 0;
 
 		/**
 		 * Indicates, that next database query could be cached, when memory caching is enabled
 		 *
 		 * @var bool
 		 * @access public
 		 */
 		public $nextQueryCachable = false;
 
 		/**
 		 * For backwards compatibility with kDBLoadBalancer class
 		 *
 		 * @var bool
 		 * @access public
 		 */
 		public $nextQueryFromMaster = false;
 
 		/**
 		 * Initializes connection class with
 		 * db type to used in future
 		 *
 		 * @param string $db_type
 		 * @param mixed $error_handler
 		 * @param int $server_index
 		 * @access public
 		 */
 		public function __construct($db_type, $error_handler = '', $server_index = 0)
 		{
 			if ( class_exists('kApplication') ) {
 				// prevents "Fatal Error" on 2nd installation step (when database is empty)
 				parent::__construct();
 			}
 
 			$this->serverIndex = $server_index;
 			$this->setErrorHandler($error_handler ? $error_handler : array(&$this, 'handleError'));
 			$this->_captureStatistics = defined('DBG_CAPTURE_STATISTICS') && DBG_CAPTURE_STATISTICS && !(defined('ADMIN') && ADMIN);
 		}
 
 		/**
 		 * Sets new error handler.
 		 *
 		 * @param mixed $error_handler Error handler.
 		 *
 		 * @return self
 		 */
 		public function setErrorHandler($error_handler)
 		{
 			$this->errorHandler = $error_handler;
 
 			return $this;
 		}
 
 		/**
 		 * Set's custom error
 		 *
 		 * @param int $code
 		 * @param string $msg
 		 * @access protected
 		 */
 		protected function setError($code, $msg)
 		{
 			$this->errorCode = $code;
 			$this->errorMessage = $msg;
 		}
 
 		/**
 		 * Checks if previous query execution raised an error.
 		 *
 		 * @return bool
 		 * @access public
 		 */
 		public function hasError()
 		{
 			return $this->errorCode != 0;
 		}
 
 		/**
 		 * Try to connect to database server using specified parameters and set database to $db if connection made.
 		 *
 		 * @param string $host
 		 * @param string $user
 		 * @param string $pass
 		 * @param string $db
 		 * @param bool   $retry
 		 *
 		 * @return bool
 		 * @access public
 		 * @throws RuntimeException When connection failed.
 		 */
 		public function Connect($host, $user, $pass, $db, $retry = false)
 		{
 			$this->connectionParams = Array ('host' => $host, 'user' => $user, 'pass' => $pass, 'db' => $db);
 
 			$this->setError(0, ''); // reset error
 			$this->connectionID = mysqli_connect($host, $user, $pass, $db);
 			$this->errorCode = mysqli_connect_errno();
 
 			if ( is_object($this->connectionID) ) {
 				if ( defined('DBG_SQL_MODE') ) {
 					$this->Query('SET SQL_MODE = "' . DBG_SQL_MODE . '"');
 				}
 
 				if ( defined('SQL_COLLATION') && defined('SQL_CHARSET') ) {
 					$this->Query('SET NAMES \'' . SQL_CHARSET . '\' COLLATE \'' . SQL_COLLATION . '\'');
 				}
 
 				if ( !$this->hasError() ) {
 					$this->connectionOpened = true;
 
 					return true;
 				}
 			}
 
 			$this->errorMessage = mysqli_connect_error();
 			$error_msg = 'Database connection failed, please check your connection settings.<br/>Error (' . $this->errorCode . '): ' . $this->errorMessage;
 
 			if ( (defined('IS_INSTALL') && IS_INSTALL) || $retry ) {
 				trigger_error($error_msg, E_USER_WARNING);
 			}
 			else {
 				$this->Application->redirectToMaintenance();
 
 				throw new RuntimeException($error_msg);
 			}
 
 			$this->connectionOpened = false;
 
 			return false;
 		}
 
 		/**
 		 * Checks if connection to database is opened.
 		 *
 		 * @return bool
 		 * @access public
 		 */
 		public function connectionOpened()
 		{
 			return $this->connectionOpened;
 		}
 
 		/**
 		 * Setups the connection according given configuration.
 		 *
 		 * @param Array $config
 		 * @return bool
 		 * @access public
 		 */
 		public function setup($config)
 		{
 			if ( is_object($this->Application) ) {
 				$this->debugMode = $this->Application->isDebugMode();
 			}
 
 			return $this->Connect(
 				$config['Database']['DBHost'],
 				$config['Database']['DBUser'],
 				$config['Database']['DBUserPassword'],
 				$config['Database']['DBName']
 			);
 		}
 
 		/**
 		 * Performs 3 reconnect attempts in case if connection to a DB was lost in the middle of script run (e.g. server restart)
 		 *
 		 * @return bool
 		 * @access protected
 		 */
 		protected function ReConnect()
 		{
 			$retry_count = 0;
 			$connected = false;
 
 			$this->connectionID->close();
 
 			while ( $retry_count < 3 ) {
 				sleep(5); // wait 5 seconds before each reconnect attempt
 
 				$connected = $this->Connect(
 					$this->connectionParams['host'],
 					$this->connectionParams['user'],
 					$this->connectionParams['pass'],
 					$this->connectionParams['db'],
 					true
 				);
 
 				if ( $connected ) {
 					break;
 				}
 
 				$retry_count++;
 			}
 
 			return $connected;
 		}
 
 		/**
 		 * Shows error message from previous operation
 		 * if it failed
 		 *
 		 * @param string $sql
 		 * @param string $key_field
 		 * @param bool $no_debug
 		 * @return bool
 		 * @access protected
 		 */
 		protected function showError($sql = '', $key_field = null, $no_debug = false)
 		{
 			static $retry_count = 0;
 
 			if ( !is_object($this->connectionID) ) {
 				// no connection while doing mysql_query
 				$this->errorCode = mysqli_connect_errno();
 
 				if ( $this->hasError() ) {
 					$this->errorMessage = mysqli_connect_error();
 
 					$ret = $this->callErrorHandler($sql);
 
 					if (!$ret) {
 						exit;
 					}
 				}
 
 				return false;
 			}
 
 			// checking if there was an error during last mysql_query
 			$this->errorCode = $this->connectionID->errno;
 
 			if ( $this->hasError() ) {
 				$this->errorMessage = $this->connectionID->error;
 
 				$ret = $this->callErrorHandler($sql);
 
 				if ( ($this->errorCode == 2006 || $this->errorCode == 2013) && ($retry_count < 3) ) {
 					// #2006 - MySQL server has gone away
 					// #2013 - Lost connection to MySQL server during query
 					$retry_count++;
 
 					if ( $this->ReConnect() ) {
 						return $this->Query($sql, $key_field, $no_debug);
 					}
 				}
 
 				if (!$ret) {
 					exit;
 				}
 			}
 			else {
 				$retry_count = 0;
 			}
 
 			return false;
 		}
 
 		/**
 		 * Sends db error to a predefined error handler
 		 *
 		 * @param $sql
 		 * @return bool
 		 * @access protected
 		 */
 		protected function callErrorHandler($sql)
 		{
 			return call_user_func($this->errorHandler, $this->errorCode, $this->errorMessage, $sql);
 		}
 
 		/**
 		 * Default error handler for sql errors
 		 *
 		 * @param int $code
 		 * @param string $msg
 		 * @param string $sql
 		 * @return bool
 		 * @access public
 		 */
 		public function handleError($code, $msg, $sql)
 		{
 			echo '<strong>Processing SQL</strong>: ' . $sql . '<br/>';
 			echo '<strong>Error (' . $code . '):</strong> ' . $msg . '<br/>';
 
 			return false;
 		}
 
 		/**
 		 * Returns first field of first line of recordset if query ok or false otherwise.
 		 *
 		 * @param string $sql
 		 * @param int $offset
 		 * @return string
 		 * @access public
 		 */
 		public function GetOne($sql, $offset = 0)
 		{
 			$row = $this->GetRow($sql, $offset);
 
 			if ( !$row ) {
 				return false;
 			}
 
 			return array_shift($row);
 		}
 
 		/**
 		 * Returns first row of recordset if query ok, false otherwise.
 		 *
 		 * @param string $sql
 		 * @param int $offset
 		 * @return Array
 		 * @access public
 		 */
 		public function GetRow($sql, $offset = 0)
 		{
 			$sql .= ' ' . $this->getLimitClause($offset, 1);
 			$ret = $this->Query($sql);
 
 			if ( !$ret ) {
 				return false;
 			}
 
 			return array_shift($ret);
 		}
 
 		/**
 		 * Returns 1st column of recordset as one-dimensional array or false otherwise.
 		 *
 		 * Optional parameter $key_field can be used to set field name to be used as resulting array key.
 		 *
 		 * @param string $sql
 		 * @param string $key_field
 		 * @return Array
 		 * @access public
 		 */
 		public function GetCol($sql, $key_field = null)
 		{
 			$rows = $this->Query($sql);
 			if ( !$rows ) {
 				return $rows;
 			}
 
 			$i = 0;
 			$row_count = count($rows);
 			$ret = Array ();
 
 			if ( isset($key_field) ) {
 				while ( $i < $row_count ) {
 					$ret[$rows[$i][$key_field]] = array_shift($rows[$i]);
 					$i++;
 				}
 			}
 			else {
 				while ( $i < $row_count ) {
 					$ret[] = array_shift($rows[$i]);
 					$i++;
 				}
 			}
 
 			return $ret;
 		}
 
 		/**
 		 * Returns iterator for 1st column of a recordset or false in case of error.
 		 *
 		 * Optional parameter $key_field can be used to set field name to be used as resulting array key.
 		 *
 		 * @param string $sql
 		 * @param string $key_field
 		 * @return bool|kMySQLQueryCol
 		 */
 		public function GetColIterator($sql, $key_field = null)
 		{
 			return $this->GetIterator($sql, $key_field, false, 'kMySQLQueryCol');
 		}
 
 		/**
 		 * Queries db with $sql query supplied and returns rows selected if any, false otherwise.
 		 *
 		 * Optional parameter $key_field allows to set one of the query fields value as key in string array.
 		 *
 		 * @param string $sql
 		 * @param string $key_field
 		 * @param bool $no_debug
 		 * @return Array
 		 * @access public
 		 */
 		public function Query($sql, $key_field = null, $no_debug = false)
 		{
 			$this->_queryCount++;
 			$this->lastQuery = $sql;
 
 			// set 1st checkpoint: begin
 			$start_time = $this->_captureStatistics ? microtime(true) : 0;
 			// set 1st checkpoint: end
 
 			$this->setError(0, ''); // reset error
 			$this->queryID = $this->connectionID->query($sql);
 
 			if ( is_object($this->queryID) ) {
 				$ret = Array ();
 
 				if ( isset($key_field) ) {
 					while ( $row = $this->queryID->fetch_assoc() ) {
 						$ret[$row[$key_field]] = $row;
 					}
 				}
 				else {
 					while ( $row = $this->queryID->fetch_assoc() ) {
 						$ret[] = $row;
 					}
 				}
 
 				// set 2nd checkpoint: begin
 				if ( $this->_captureStatistics ) {
 					$query_time = microtime(true) - $start_time;
 
 					if ( $query_time > DBG_MAX_SQL_TIME ) {
 						$this->Application->logSlowQuery($sql, $query_time);
 					}
 
 					$this->_queryTime += $query_time;
 				}
 				// set 2nd checkpoint: end
 
 				$this->Destroy();
 
 				return $ret;
 			}
 			else {
 				// set 2nd checkpoint: begin
 				if ( $this->_captureStatistics ) {
 					$this->_queryTime += microtime(true) - $start_time;
 				}
 				// set 2nd checkpoint: end
 			}
 
 			return $this->showError($sql, $key_field, $no_debug);
 		}
 
 		/**
 		 * Returns iterator to a recordset, produced from running $sql query.
 		 *
 		 * Queries db with $sql query supplied and returns kMySQLQuery iterator or false in case of error.
 		 * Optional parameter $key_field allows to set one of the query fields value as key in string array.
 		 *
 		 * @param string $sql
 		 * @param string $key_field
 		 * @param bool   $no_debug
 		 * @param string $iterator_class
 		 * @return kMySQLQuery|bool
 		 * @access public
 		 */
 		public function GetIterator($sql, $key_field = null, $no_debug = false, $iterator_class = 'kMySQLQuery')
 		{
 			$this->_queryCount++;
 			$this->lastQuery = $sql;
 
 			// set 1st checkpoint: begin
 			$start_time = $this->_captureStatistics ? microtime(true) : 0;
 			// set 1st checkpoint: end
 
 			$this->setError(0, ''); // reset error
 			$this->queryID = $this->connectionID->query($sql);
 
 			if ( is_object($this->queryID) ) {
+				/** @var kMySQLQuery $ret */
 				$ret = new $iterator_class($this->queryID, $key_field);
-				/* @var $ret kMySQLQuery */
 
 				// set 2nd checkpoint: begin
 				if ( $this->_captureStatistics ) {
 					$query_time = microtime(true) - $start_time;
 
 					if ( $query_time > DBG_MAX_SQL_TIME ) {
 						$this->Application->logSlowQuery($sql, $query_time);
 					}
 
 					$this->_queryTime += $query_time;
 				}
 				// set 2nd checkpoint: end
 
 				return $ret;
 			}
 			else {
 				// set 2nd checkpoint: begin
 				if ( $this->_captureStatistics ) {
 					$this->_queryTime += microtime(true) - $start_time;
 				}
 				// set 2nd checkpoint: end
 			}
 
 			return $this->showError($sql, $key_field, $no_debug);
 		}
 
 		/**
 		 * Free memory used to hold recordset handle.
 		 *
 		 * @access public
 		 */
 		public function Destroy()
 		{
 			$this->queryID->free();
 			unset($this->queryID);
 		}
 
 		/**
 		 * Performs sql query, that will change database content.
 		 *
 		 * @param string $sql
 		 * @return bool
 		 * @access public
 		 */
 		public function ChangeQuery($sql)
 		{
 			$this->Query($sql);
 
 			return !$this->hasError();
 		}
 
 		/**
 		 * Returns auto increment field value from insert like operation if any, zero otherwise.
 		 *
 		 * @return int
 		 * @access public
 		 */
 		public function getInsertID()
 		{
 			return $this->connectionID->insert_id;
 		}
 
 		/**
 		 * Returns row count affected by last query.
 		 *
 		 * @return int
 		 * @access public
 		 */
 		public function getAffectedRows()
 		{
 			return $this->connectionID->affected_rows;
 		}
 
 		/**
 		 * Returns LIMIT sql clause part for specific db.
 		 *
 		 * @param int $offset
 		 * @param int $rows
 		 * @return string
 		 * @access public
 		 */
 		public function getLimitClause($offset, $rows)
 		{
 			if ( !($rows > 0) ) {
 				return '';
 			}
 
 			return 'LIMIT ' . $offset . ',' . $rows;
 		}
 
 		/**
 		 * If it's a string, adds quotes and backslashes. Otherwise returns as-is.
 		 *
 		 * @param mixed $string
 		 * @return string
 		 * @access public
 		 */
 		public function qstr($string)
 		{
 			if ( is_null($string) ) {
 				return 'NULL';
 			}
 
 			# This will also quote numeric values. This should be harmless,
 			# and protects against weird problems that occur when they really
 			# _are_ strings such as article titles and string->number->string
 			# conversion is not 1:1.
 			return "'" . $this->connectionID->real_escape_string($string) . "'";
 		}
 
 		/**
 		 * Calls "qstr" function for each given array element.
 		 *
 		 * @param Array $array
 		 * @param string $function
 		 * @return Array
 		 */
 		public function qstrArray($array, $function = 'qstr')
 		{
 			return array_map(Array (&$this, $function), $array);
 		}
 
 		/**
 		 * Escapes string.
 		 *
 		 * @param mixed $string
 		 * @return string
 		 * @access public
 		 */
 		public function escape($string)
 		{
 			if ( is_null($string) ) {
 				return 'NULL';
 			}
 
 			$string = $this->connectionID->real_escape_string($string);
 
 			// prevent double-escaping of MySQL wildcard symbols ("%" and  "_") in case if they were already escaped
 			return str_replace(Array ('\\\\%', '\\\\_'), Array ('\\%', '\\_'), $string);
 		}
 
 		/**
 		 * Returns last error code occurred.
 		 *
 		 * @return int
 		 * @access public
 		 */
 		public function getErrorCode()
 		{
 			return $this->errorCode;
 		}
 
 		/**
 		 * Returns last error message.
 		 *
 		 * @return string
 		 * @access public
 		 */
 		public function getErrorMsg()
 		{
 			return $this->errorMessage;
 		}
 
 		/**
 		 * Performs insert of given data (useful with small number of queries)
 		 * or stores it to perform multiple insert later (useful with large number of queries).
 		 *
 		 * @param Array $fields_hash
 		 * @param string $table
 		 * @param string $type
 		 * @param bool $insert_now
 		 * @return bool
 		 * @access public
 		 */
 		public function doInsert($fields_hash, $table, $type = 'INSERT', $insert_now = true)
 		{
 			static $value_sqls = Array ();
 
 			if ($insert_now) {
 				$fields_sql = '`' . implode('`,`', array_keys($fields_hash)) . '`';
 			}
 
 			$values_sql = '';
 			foreach ($fields_hash as $field_name => $field_value) {
 				$values_sql .= $this->qstr($field_value) . ',';
 			}
 
 			// don't use preg here, as it may fail when string is too long
 			$value_sqls[] = rtrim($values_sql, ',');
 
 			$insert_result = true;
 			if ($insert_now) {
 				$insert_count = count($value_sqls);
 				if (($insert_count > 1) && ($value_sqls[$insert_count - 1] == $value_sqls[$insert_count - 2])) {
 					// last two records are the same
 					array_pop($value_sqls);
 				}
 
 				$sql = strtoupper($type) . ' INTO `' . $table . '` (' . $fields_sql . ') VALUES (' . implode('),(', $value_sqls) . ')';
 				$value_sqls = Array (); // reset before query to prevent repeated call from error handler to insert 2 records instead of 1
 
 				$insert_result = $this->ChangeQuery($sql);
 			}
 
 			return $insert_result;
 		}
 
 		/**
 		 * Update given field values to given record using $key_clause.
 		 *
 		 * @param Array $fields_hash
 		 * @param string $table
 		 * @param string $key_clause
 		 * @return bool
 		 * @access public
 		 */
 		public function doUpdate($fields_hash, $table, $key_clause)
 		{
 			if (!$fields_hash) return true;
 
 			$fields_sql = '';
 			foreach ($fields_hash as $field_name => $field_value) {
 				$fields_sql .= '`'.$field_name.'` = ' . $this->qstr($field_value) . ',';
 			}
 
 			// don't use preg here, as it may fail when string is too long
 			$fields_sql = rtrim($fields_sql, ',');
 
 			$sql = 'UPDATE `'.$table.'` SET '.$fields_sql.' WHERE '.$key_clause;
 
 			return $this->ChangeQuery($sql);
 		}
 
 		/**
 		 * Allows to detect table's presence in database.
 		 *
 		 * @param string $table_name
 		 * @param bool $force
 		 * @return bool
 		 * @access public
 		 */
 		public function TableFound($table_name, $force = false)
 		{
 			static $table_found = false;
 
 			if ( $table_found === false ) {
 				$table_found = array_flip($this->GetCol('SHOW TABLES'));
 			}
 
 			if ( !preg_match('/^' . preg_quote(TABLE_PREFIX, '/') . '(.*)/', $table_name) ) {
 				$table_name = TABLE_PREFIX . $table_name;
 			}
 
 			if ( $force ) {
 				if ( $this->Query('SHOW TABLES LIKE ' . $this->qstr($table_name)) ) {
 					$table_found[$table_name] = 1;
 				}
 				else {
 					unset($table_found[$table_name]);
 				}
 			}
 
 			return isset($table_found[$table_name]);
 		}
 
 		/**
 		 * Returns query processing statistics.
 		 *
 		 * @return Array
 		 * @access public
 		 */
 		public function getQueryStatistics()
 		{
 			return Array ('time' => $this->_queryTime, 'count' => $this->_queryCount);
 		}
 
 		/**
 		 * Get status information from SHOW STATUS in an associative array.
 		 *
 		 * @param string $which
 		 * @return Array
 		 * @access public
 		 */
 		public function getStatus($which = '%')
 		{
 			$status = Array ();
 			$records = $this->Query('SHOW STATUS LIKE "' . $which . '"');
 
 			foreach ($records as $record) {
 				$status[ $record['Variable_name'] ] = $record['Value'];
 			}
 
 			return $status;
 		}
 
 		/**
 		 * Get slave replication lag. It will only work if the DB user has the PROCESS privilege.
 		 *
 		 * @return int
 		 * @access public
 		 */
 		public function getSlaveLag()
 		{
 			// don't use kDBConnection::Query method, since it will create an array of all server processes
 			$processes = $this->GetIterator('SHOW PROCESSLIST');
 
 			$skip_states = Array (
 				'Waiting for master to send event',
 				'Connecting to master',
 				'Queueing master event to the relay log',
 				'Waiting for master update',
 				'Requesting binlog dump',
 			);
 
 			// find slave SQL thread
 			foreach ($processes as $process) {
 				if ( $process['User'] == 'system user' &&  !in_array($process['State'], $skip_states) ) {
 					// this is it, return the time (except -ve)
 
 					return $process['Time'] > 0x7fffffff ? false : $process['Time'];
 				}
 			}
 
 			return false;
 		}
 	}
 
 
 class kDBConnectionDebug extends kDBConnection {
 
 	protected $_profileSQLs = false;
 
 	/**
 	 * Info about this database connection to show in debugger report
 	 *
 	 * @var string
 	 * @access protected
 	 */
 	protected $serverInfoLine = '';
 
 	/**
 	 * Initializes connection class with
 	 * db type to used in future
 	 *
 	 * @param string $db_type
 	 * @param string $error_handler
 	 * @param int $server_index
 	 * @access public
 	 */
 	public function __construct($db_type, $error_handler = '', $server_index = 0)
 	{
 		parent::__construct($db_type, $error_handler, $server_index);
 
 		$this->_profileSQLs = defined('DBG_SQL_PROFILE') && DBG_SQL_PROFILE;
 	}
 
 	/**
 	 * Try to connect to database server
 	 * using specified parameters and set
 	 * database to $db if connection made
 	 *
 	 * @param string $host
 	 * @param string $user
 	 * @param string $pass
 	 * @param string $db
 	 * @param bool $force_new
 	 * @param bool $retry
 	 * @return bool
 	 * @access public
 	 */
 	public function Connect($host, $user, $pass, $db, $force_new = false, $retry = false)
 	{
 		if ( defined('DBG_SQL_SERVERINFO') && DBG_SQL_SERVERINFO ) {
 			$this->serverInfoLine = $this->serverIndex . ' (' . $host . ')';
 		}
 
 		return parent::Connect($host, $user, $pass, $db, $force_new, $retry);
 	}
 
 	/**
 	 * Queries db with $sql query supplied and returns rows selected if any, false otherwise.
 	 *
 	 * Optional parameter $key_field allows to set one of the query fields value as key in string array.
 	 *
 	 * @param string $sql
 	 * @param string $key_field
 	 * @param bool $no_debug
 	 * @return Array
 	 * @access public
 	 */
 	public function Query($sql, $key_field = null, $no_debug = false)
 	{
 		if ( $no_debug ) {
 			return parent::Query($sql, $key_field, $no_debug);
 		}
 
 		global $debugger;
 
 		$this->_queryCount++;
 		$this->lastQuery = $sql;
 
 		// set 1st checkpoint: begin
 		if ( $this->_profileSQLs ) {
 			$queryID = $debugger->generateID();
 			$debugger->profileStart('sql_' . $queryID, $debugger->formatSQL($sql));
 		}
 		// set 1st checkpoint: end
 
 		$this->setError(0, ''); // reset error
 		$this->queryID = $this->connectionID->query($sql);
 
 		if ( is_object($this->queryID) ) {
 			$ret = Array ();
 
 			if ( isset($key_field) ) {
 				while ( $row = $this->queryID->fetch_assoc() ) {
 					$ret[$row[$key_field]] = $row;
 				}
 			}
 			else {
 				while ( $row = $this->queryID->fetch_assoc() ) {
 					$ret[] = $row;
 				}
 			}
 
 			// set 2nd checkpoint: begin
 			if ( $this->_profileSQLs ) {
 				$current_element = current($ret);
 				$first_cell = count($ret) == 1 && count($current_element) == 1 ? current($current_element) : null;
 
 				if ( strlen($first_cell) > 200 ) {
 					$first_cell = substr($first_cell, 0, 50) . ' ...';
 				}
 
 				$debugger->profileFinish('sql_' . $queryID, null, null, $this->getAffectedRows(), $first_cell, $this->_queryCount, $this->nextQueryCachable, $this->serverInfoLine);
 				$debugger->profilerAddTotal('sql', 'sql_' . $queryID);
 				$this->nextQueryCachable = false;
 			}
 			// set 2nd checkpoint: end
 
 			$this->Destroy();
 
 			return $ret;
 		}
 		else {
 			// set 2nd checkpoint: begin
 			if ( $this->_profileSQLs ) {
 				$debugger->profileFinish('sql_' . $queryID, null, null, $this->getAffectedRows(), null, $this->_queryCount, $this->nextQueryCachable, $this->serverInfoLine);
 				$debugger->profilerAddTotal('sql', 'sql_' . $queryID);
 				$this->nextQueryCachable = false;
 			}
 			// set 2nd checkpoint: end
 		}
 
 		return $this->showError($sql, $key_field);
 	}
 
 	/**
 	 * Returns iterator to a recordset, produced from running $sql query.
 	 *
 	 * Queries db with $sql query supplied and returns kMySQLQuery iterator or false in case of error.
 	 * Optional parameter $key_field allows to set one of the query fields value as key in string array.
 	 *
 	 * @param string $sql
 	 * @param string $key_field
 	 * @param bool   $no_debug
 	 * @param string $iterator_class
 	 * @return kMySQLQuery|bool
 	 * @access public
 	 */
 	public function GetIterator($sql, $key_field = null, $no_debug = false, $iterator_class = 'kMySQLQuery')
 	{
 		if ( $no_debug ) {
 			return parent::Query($sql, $key_field, $no_debug, $iterator_class);
 		}
 
 		global $debugger;
 
 		$this->_queryCount++;
 		$this->lastQuery = $sql;
 
 		// set 1st checkpoint: begin
 		if ( $this->_profileSQLs ) {
 			$queryID = $debugger->generateID();
 			$debugger->profileStart('sql_' . $queryID, $debugger->formatSQL($sql));
 		}
 		// set 1st checkpoint: end
 
 		$this->setError(0, ''); // reset error
 		$this->queryID = $this->connectionID->query($sql);
 
 		if ( is_object($this->queryID) ) {
+			/** @var kMySQLQuery $ret */
 			$ret = new $iterator_class($this->queryID, $key_field);
-			/* @var $ret kMySQLQuery */
 
 			// set 2nd checkpoint: begin
 			if ( $this->_profileSQLs ) {
 				$current_row = $ret->current();
 
 				if ( count($ret) == 1 && $ret->fieldCount() == 1 ) {
 					if ( is_array($current_row) ) {
 						$first_cell = current($current_row);
 					}
 					else {
 						$first_cell = $current_row;
 					}
 				}
 				else {
 					$first_cell = null;
 				}
 
 				if ( strlen($first_cell) > 200 ) {
 					$first_cell = substr($first_cell, 0, 50) . ' ...';
 				}
 
 				$debugger->profileFinish('sql_' . $queryID, null, null, $this->getAffectedRows(), $first_cell, $this->_queryCount, $this->nextQueryCachable, $this->serverInfoLine);
 				$debugger->profilerAddTotal('sql', 'sql_' . $queryID);
 				$this->nextQueryCachable = false;
 			}
 			// set 2nd checkpoint: end
 
 			return $ret;
 		}
 		else {
 			// set 2nd checkpoint: begin
 			if ( $this->_profileSQLs ) {
 				$debugger->profileFinish('sql_' . $queryID, null, null, $this->getAffectedRows(), null, $this->_queryCount, $this->nextQueryCachable, $this->serverInfoLine);
 				$debugger->profilerAddTotal('sql', 'sql_' . $queryID);
 				$this->nextQueryCachable = false;
 			}
 			// set 2nd checkpoint: end
 		}
 
 		return $this->showError($sql, $key_field);
 	}
 }
 
 
 class kMySQLQuery implements Iterator, Countable, SeekableIterator {
 
 	/**
 	 * Current index in recordset
 	 *
 	 * @var int
 	 * @access protected
 	 */
 	protected $position = -1;
 
 	/**
 	 * Query resource
 	 *
 	 * @var mysqli_result
 	 * @access protected
 	 */
 	protected $result;
 
 	/**
 	 * Field to act as key in a resulting array
 	 *
 	 * @var string
 	 * @access protected
 	 */
 	protected $keyField = null;
 
 	/**
 	 * Data in current row of recordset
 	 *
 	 * @var Array
 	 * @access protected
 	 */
 	protected $rowData = Array ();
 
 	/**
 	 * Row count in a result
 	 *
 	 * @var int
 	 * @access protected
 	 */
 	protected $rowCount = 0;
 
 	/**
 	 * Creates new instance of a class
 	 *
 	 * @param mysqli_result $result
 	 * @param null|string $key_field
 	 */
 	public function __construct(mysqli_result $result, $key_field = null)
 	{
 		$this->result = $result;
 		$this->keyField = $key_field;
 
 		$this->rowCount = $this->result->num_rows;
 		$this->rewind();
 	}
 
 	/**
 	 * Moves recordset pointer to first element
 	 *
 	 * @return void
 	 * @access public
 	 * @implements Iterator::rewind
 	 */
 	public function rewind()
 	{
 		$this->seek(0);
 	}
 
 	/**
 	 * Returns value at current position
 	 *
 	 * @return mixed
 	 * @access public
 	 * @implements Iterator::current
 	 */
 	function current()
 	{
 		return $this->rowData;
 	}
 
 	/**
 	 * Returns key at current position
 	 *
 	 * @return mixed
 	 * @access public
 	 * @implements Iterator::key
 	 */
 	function key()
 	{
 		return $this->keyField ? $this->rowData[$this->keyField] : $this->position;
 	}
 
 	/**
 	 * Moves recordset pointer to next position
 	 *
 	 * @return void
 	 * @access public
 	 * @implements Iterator::next
 	 */
 	function next()
 	{
 		$this->seek($this->position + 1);
 	}
 
 	/**
 	 * Detects if current position is within recordset bounds
 	 *
 	 * @return bool
 	 * @access public
 	 * @implements Iterator::valid
 	 */
 	public function valid()
 	{
 		return $this->position < $this->rowCount;
 	}
 
 	/**
 	 * Counts recordset rows
 	 *
 	 * @return int
 	 * @access public
 	 * @implements Countable::count
 	 */
 	public function count()
 	{
 		return $this->rowCount;
 	}
 
 	/**
 	 * Counts fields in current row
 	 *
 	 * @return int
 	 * @access public
 	 */
 	public function fieldCount()
 	{
 		return count($this->rowData);
 	}
 
 	/**
 	 * Moves cursor into given position within recordset
 	 *
 	 * @param int $position
 	 * @throws OutOfBoundsException
 	 * @access public
 	 * @implements SeekableIterator::seek
 	 */
 	public function seek($position)
 	{
 		if ( $this->position == $position ) {
 			return;
 		}
 
 		$this->position = $position;
 
 		if ( $this->valid() ) {
 			$this->result->data_seek($this->position);
 
 			$this->rowData = $this->result->fetch_assoc();
 		}
 
 		/*if ( !$this->valid() ) {
 			throw new OutOfBoundsException('Invalid seek position (' . $position . ')');
 		}*/
 	}
 
 	/**
 	 * Returns first recordset row
 	 *
 	 * @return Array
 	 * @access public
 	 */
 	public function first()
 	{
 		$this->seek(0);
 
 		return $this->rowData;
 	}
 
 	/**
 	 * Closes recordset and freese memory
 	 *
 	 * @return void
 	 * @access public
 	 */
 	public function close()
 	{
 		$this->result->free();
 		unset($this->result);
 	}
 
 	/**
 	 * Frees memory when object is destroyed
 	 *
 	 * @return void
 	 * @access public
 	 */
 	public function __destruct()
 	{
 		$this->close();
 	}
 
 	/**
 	 * Returns all keys
 	 *
 	 * @return Array
 	 * @access public
 	 */
 	public function keys()
 	{
 		$ret = Array ();
 
 		foreach ($this as $key => $value) {
 			$ret[] = $key;
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Returns all values
 	 *
 	 * @return Array
 	 * @access public
 	 */
 	public function values()
 	{
 		$ret = Array ();
 
 		foreach ($this as $value) {
 			$ret[] = $value;
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Returns whole recordset as array
 	 *
 	 * @return Array
 	 * @access public
 	 */
 	public function toArray()
 	{
 		$ret = Array ();
 
 		foreach ($this as $key => $value) {
 			$ret[$key] = $value;
 		}
 
 		return $ret;
 	}
 }
 
 
 class kMySQLQueryCol extends kMySQLQuery {
 
 	/**
 	 * Returns value at current position
 	 *
 	 * @return mixed
 	 * @access public
 	 * @implements Iterator::current
 	 */
 	function current()
 	{
 		return reset($this->rowData);
 	}
 
 	/**
 	 * Returns first column of first recordset row
 	 *
 	 * @return string
 	 * @access public
 	 */
 	public function first()
 	{
 		$this->seek(0);
 
 		return reset($this->rowData);
 	}
 }
Index: branches/5.3.x/core/kernel/db/dbitem.php
===================================================================
--- branches/5.3.x/core/kernel/db/dbitem.php	(revision 16518)
+++ branches/5.3.x/core/kernel/db/dbitem.php	(revision 16519)
@@ -1,1611 +1,1611 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 /**
 * DBItem
 *
 */
 class kDBItem extends kDBBase {
 
 	/**
 	* Description
 	*
 	* @var array Associative array of current item' field values
 	* @access protected
 	*/
 	protected $FieldValues = Array ();
 
 	/**
 	 * Unformatted field values, before parse
 	 *
 	 * @var Array
 	 * @access protected
 	 */
 	protected $DirtyFieldValues = Array ();
 
 	/**
 	 * Holds item values after loading (not affected by submit)
 	 *
 	 * @var Array
 	 * @access protected
 	 */
 	protected $OriginalFieldValues = Array ();
 
 	/**
 	* If set to true, Update will skip Validation before running
 	*
 	* @var array Associative array of current item' field values
 	* @access public
 	*/
 	public $IgnoreValidation = false;
 
 	/**
 	 * Remembers if object was loaded
 	 *
 	 * @var bool
 	 * @access protected
 	 */
 	protected $Loaded = false;
 
 	/**
 	* Holds item' primary key value
 	*
 	* @var int Value of primary key field for current item
 	* @access protected
 	*/
 	protected $ID;
 
 	/**
 	 * This object is used in cloning operations
 	 *
 	 * @var bool
 	 * @access public
 	 */
 	public $inCloning = false;
 
 	/**
 	 * Validator object reference
 	 *
 	 * @var kValidator
 	 */
 	protected $validator = null;
 
 	/**
 	 * Creates validator object, only when required
 	 *
 	 */
 	public function initValidator()
 	{
 		if ( !is_object($this->validator) ) {
 			$validator_class = $this->getUnitConfig()->getValidatorClass('kValidator');
 
 			$this->validator = $this->Application->makeClass($validator_class);
 		}
 
 		$this->validator->setDataSource($this);
 	}
 
 	public function SetDirtyField($field_name, $field_value)
 	{
 		$this->DirtyFieldValues[$field_name] = $field_value;
 	}
 
 	public function GetDirtyField($field_name)
 	{
 		return $this->DirtyFieldValues[$field_name];
 	}
 
 	public function GetOriginalField($field_name, $formatted = false, $format=null)
 	{
 		if (array_key_exists($field_name, $this->OriginalFieldValues)) {
 			// item was loaded before
 			$value = $this->OriginalFieldValues[$field_name];
 		}
 		else {
 			// no original fields -> use default field value
 			$value = $this->Fields[$field_name]['default'];
 		}
 
 		if (!$formatted) {
 			return $value;
 		}
 
 		$res = $value;
 		$formatter = $this->GetFieldOption($field_name, 'formatter');
 
 		if ( $formatter ) {
+			/** @var kFormatter $formatter */
 			$formatter = $this->Application->recallObject($formatter);
-			/* @var $formatter kFormatter */
 
 			$res = $formatter->Format($value, $field_name, $this, $format);
 		}
 
 		return $res;
 	}
 
 	/**
 	 * Sets original field value (useful for custom virtual fields)
 	 *
 	 * @param string $field_name
 	 * @param string $field_value
 	 */
 	public function SetOriginalField($field_name, $field_value)
 	{
 		$this->OriginalFieldValues[$field_name] = $field_value;
 	}
 
 	/**
 	 * Set's default values for all fields
 	 *
 	 * @access public
 	 */
 	public function SetDefaultValues()
 	{
 		parent::SetDefaultValues();
 
 		if ($this->populateMultiLangFields) {
 			$this->PopulateMultiLangFields();
 		}
 
 		foreach ($this->Fields as $field => $field_options) {
 			$default_value = isset($field_options['default']) ? $field_options['default'] : NULL;
 			$this->SetDBField($field, $default_value);
 		}
 	}
 
 	/**
 	* Sets current item field value
 	* (applies formatting)
 	*
 	* @access public
 	* @param string $name Name of the field
 	* @param mixed $value Value to set the field to
 	* @return void
 	*/
 	public function SetField($name,$value)
 	{
 		$options = $this->GetFieldOptions($name);
 		$parsed = $value;
 		if ($value == '') {
 			$parsed = NULL;
 		}
 
 		// kFormatter is always used, to make sure, that numeric value is converted to normal representation
 		// according to regional format, even when formatter is not set (try seting format to 1.234,56 to understand why)
+		/** @var kFormatter $formatter */
 		$formatter = $this->Application->recallObject(isset($options['formatter']) ? $options['formatter'] : 'kFormatter');
-		/* @var $formatter kFormatter */
 
 		$parsed = $formatter->Parse($value, $name, $this);
 
 		$this->SetDBField($name,$parsed);
 	}
 
 	/**
 	* Sets current item field value
 	* (doesn't apply formatting)
 	*
 	* @access public
 	* @param string $name Name of the field
 	* @param mixed $value Value to set the field to
 	* @return void
 	*/
 	public function SetDBField($name,$value)
 	{
 		$this->FieldValues[$name] = $value;
 	}
 
 	/**
 	 * Set's field error, if pseudo passed not found then create it with message text supplied.
 	 * Don't overwrite existing pseudo translation.
 	 *
 	 * @param string $field
 	 * @param string $pseudo
 	 * @param string $error_label
 	 * @param Array $error_params
 	 *
 	 * @return bool
 	 * @access public
 	 */
 	public function SetError($field, $pseudo, $error_label = null, $error_params = null)
 	{
 		$this->initValidator();
 
 		return $this->validator->SetError($field, $pseudo, $error_label, $error_params);
 	}
 
 	/**
 	 * Removes error on field
 	 *
 	 * @param string $field
 	 * @access public
 	 */
 	public function RemoveError($field)
 	{
 		if ( !is_object($this->validator) ) {
 			return ;
 		}
 
 		$this->validator->RemoveError($field);
 	}
 
 	/**
 	 * Returns error pseudo
 	 *
 	 * @param string $field
 	 * @return string
 	 */
 	public function GetErrorPseudo($field)
 	{
 		if ( !is_object($this->validator) ) {
 			return '';
 		}
 
 		return $this->validator->GetErrorPseudo($field);
 	}
 
 	/**
 	* Return current item' field value by field name
 	* (doesn't apply formatter)
 	*
 	* @param string $name field name to return
 	* @return mixed
 	* @access public
 	*/
 	public function GetDBField($name)
 	{
 		/*if (!array_key_exists($name, $this->FieldValues) && defined('DEBUG_MODE') && DEBUG_MODE) {
 			$this->Application->Debugger->appendTrace();
 		}*/
 
 		return $this->FieldValues[$name];
 	}
 
 	public function HasField($name)
 	{
 		return array_key_exists($name, $this->FieldValues);
 	}
 
 	public function GetFieldValues()
 	{
 		return $this->FieldValues;
 	}
 
 	/**
 	 * Sets item' fields corresponding to elements in passed $hash values.
 	 * The function sets current item fields to values passed in $hash, by matching $hash keys with field names
 	 * of current item. If current item' fields are unknown {@link kDBItem::PrepareFields()} is called before actually setting the fields
 	 *
 	 * @param Array $hash       Fields hash.
 	 * @param Array $set_fields Optional param, field names in target object to set, other fields will be skipped
 	 *
 	 * @return void
 	 */
 	public function SetFieldsFromHash($hash, $set_fields = Array ())
 	{
 		if ( !$set_fields ) {
 			$set_fields = array_keys($hash);
 		}
 
 		$skip_fields = $this->getRequestProtectedFields($hash);
 
 		if ( $skip_fields ) {
 			$set_fields = array_diff($set_fields, $skip_fields);
 		}
 
 		$set_fields = array_intersect($set_fields, array_keys($this->Fields));
 
 		// used in formatter which work with multiple fields together
 		foreach ($set_fields as $field_name) {
 			$this->SetDirtyField($field_name, $hash[$field_name]);
 		}
 
 		// formats all fields using associated formatters
 		foreach ($set_fields as $field_name) {
 			$this->SetField($field_name, $hash[$field_name]);
 		}
 	}
 
 	/**
 	 * Returns fields, that are not allowed to be changed from request.
 	 *
 	 * @param array $fields_hash Fields hash.
 	 *
 	 * @return array
 	 */
 	protected function getRequestProtectedFields(array $fields_hash)
 	{
 		// by default don't allow changing ID or foreign key from request
 		$config = $this->getUnitConfig();
 
 		$fields = Array ();
 		$fields[] = $config->getIDField();
 
 		$parent_prefix = $config->getParentPrefix();
 
 		if ( $parent_prefix && $this->isLoaded() && !$this->Application->isAdmin ) {
 			// don't allow changing foreign key of existing item from request
 			$fields[] = $config->getForeignKey($parent_prefix);
 		}
 
 		return $fields;
 	}
 
 	/**
 	 * Sets object fields from $hash array
 	 * @param Array $hash
 	 * @param Array|null $set_fields
 	 * @return void
 	 * @access public
 	 */
 	public function SetDBFieldsFromHash($hash, $set_fields = Array ())
 	{
 		if ( !$set_fields ) {
 			$set_fields = array_keys($hash);
 		}
 
 		$set_fields = array_intersect($set_fields, array_keys($this->Fields));
 
 		foreach ($set_fields as $field_name) {
 			$this->SetDBField($field_name, $hash[$field_name]);
 		}
 	}
 
 	/**
 	 * Returns part of SQL WHERE clause identifying the record, ex. id = 25
 	 *
 	 * @param string $method Child class may want to know who called GetKeyClause, Load(), Update(), Delete() send its names as method
 	 * @param Array $keys_hash alternative, then item id, keys hash to load item by
 	 * @see kDBItem::Load()
 	 * @see kDBItem::Update()
 	 * @see kDBItem::Delete()
 	 * @return string
 	 * @access protected
 	 */
 	protected function GetKeyClause($method = null, $keys_hash = null)
 	{
 		if ( !isset($keys_hash) ) {
 			$keys_hash = Array ($this->IDField => $this->ID);
 		}
 
 		$ret = '';
 
 		foreach ($keys_hash as $field => $value) {
 			$value_part = is_null($value) ? ' IS NULL' : ' = ' . $this->Conn->qstr($value);
 
 			$ret .= '(' . (strpos($field, '.') === false ? '`' . $this->TableName . '`.' : '') . $field . $value_part . ') AND ';
 		}
 
 		return substr($ret, 0, -5);
 	}
 
 	/**
 	 * Loads item from the database by given id
 	 *
 	 * @access public
 	 * @param mixed $id item id of keys->values hash to load item by
 	 * @param string $id_field_name Optional parameter to load item by given Id field
 	 * @param bool $cachable cache this query result based on it's prefix serial
 	 * @return bool True if item has been loaded, false otherwise
 	 */
 	public function Load($id, $id_field_name = null, $cachable = false)
 	{
 		$this->Clear();
 
 		if ( isset($id_field_name) ) {
 			$this->IDField = $id_field_name; // set new IDField
 		}
 
 		$keys_sql = '';
 		if (is_array($id)) {
 			$keys_sql = $this->GetKeyClause('load', $id);
 		}
 		else {
 			$this->setID($id);
 			$keys_sql = $this->GetKeyClause('load');
 		}
 
 		if ( isset($id_field_name) ) {
 			// restore original IDField from unit config
 			$this->IDField = $this->getUnitConfig()->getIDField();
 		}
 
 		if (($id === false) || !$keys_sql) {
 			return false;
 		}
 
 		if (!$this->raiseEvent('OnBeforeItemLoad', $id)) {
 			return false;
 		}
 
 		$q = $this->GetSelectSQL() . ' WHERE ' . $keys_sql;
 
 		if ($cachable && $this->Application->isCachingType(CACHING_TYPE_MEMORY)) {
 			$serial_name = $this->Application->incrementCacheSerial($this->Prefix == 'st' ? 'c' : $this->Prefix, isset($id_field_name) ? null : $id, false);
 			$cache_key = 'kDBItem::Load_' . crc32(serialize($id) . '-' . $this->IDField) . '[%' . $serial_name . '%]';
 			$field_values = $this->Application->getCache($cache_key, false);
 
 			if ($field_values === false) {
 				$field_values = $this->Conn->GetRow($q);
 
 				if ($field_values !== false) {
 					// only cache, when data was retrieved
 					$this->Application->setCache($cache_key, $field_values);
 				}
 			}
 		}
 		else {
 			$field_values = $this->Conn->GetRow($q);
 		}
 
 		if ($field_values) {
 			$this->FieldValues = array_merge($this->FieldValues, $field_values);
 			$this->OriginalFieldValues = $this->FieldValues;
 			$this->Loaded = true;
 		}
 		else {
 			return false;
 		}
 
 		if (is_array($id) || isset($id_field_name)) {
 			$this->setID($this->FieldValues[$this->IDField]);
 		}
 
 		$this->UpdateFormattersSubFields(); // used for updating separate virtual date/time fields from DB timestamp (for example)
 
 		$this->raiseEvent('OnAfterItemLoad', $this->GetID());
 
 		return true;
 	}
 
 	/**
 	 * Loads object from hash (not db)
 	 *
 	 * @param Array $fields_hash
 	 * @param string $id_field
 	 */
 	public function LoadFromHash($fields_hash, $id_field = null)
 	{
 		if (!isset($id_field)) {
 			$id_field = $this->IDField;
 		}
 
 		$this->Clear();
 
 		if (!$fields_hash || !array_key_exists($id_field, $fields_hash)) {
 			// no data OR id field missing
 			return false;
 		}
 
 		$id = $fields_hash[$id_field];
 
 		if ( !$this->raiseEvent('OnBeforeItemLoad', $id) ) {
 			return false;
 		}
 
 		$this->FieldValues = array_merge($this->FieldValues, $fields_hash);
 		$this->OriginalFieldValues = $this->FieldValues;
 
 		$this->setID($id);
 		$this->UpdateFormattersSubFields(); // used for updating separate virtual date/time fields from DB timestamp (for example)
 
 		$this->raiseEvent('OnAfterItemLoad', $id);
 
 		$this->Loaded = true;
 
 		return true;
 	}
 
 	/**
 	* Builds select sql, SELECT ... FROM parts only
 	*
 	* @access public
 	* @return string
 	*/
 
 	/**
 	 * Returns SELECT part of list' query
 	 *
 	 * @param string $base_query
 	 * @param bool $replace_table
 	 * @return string
 	 * @access public
 	 */
 	public function GetSelectSQL($base_query = null, $replace_table = true)
 	{
 		if (!isset($base_query)) {
 			$base_query = $this->SelectClause;
 		}
 
 		$base_query = $this->addCalculatedFields($base_query);
 
 		return parent::GetSelectSQL($base_query, $replace_table);
 	}
 
 	public function UpdateFormattersMasterFields()
 	{
 		$this->initValidator(); // used, when called not from kValidator::Validate method
 
 		foreach ($this->Fields as $field => $options) {
 			if ( isset($options['formatter']) ) {
+				/** @var kFormatter $formatter */
 				$formatter = $this->Application->recallObject($options['formatter']);
-				/* @var $formatter kFormatter */
 
 				$formatter->UpdateMasterFields($field, $this->GetDBField($field), $options, $this);
 			}
 		}
 	}
 
 	/**
 	 * Returns variable name, used to store pending file actions
 	 *
 	 * @return string
 	 * @access protected
 	 */
 	protected function _getPendingActionVariableName()
 	{
 		$window_id = $this->Application->GetTopmostWid($this->Prefix);
 
 		return $this->Prefix . '_file_pending_actions' . $window_id;
 	}
 
 	/**
 	 * Returns pending actions
 	 *
 	 * @param mixed $id
 	 * @return Array
 	 * @access public
 	 */
 	public function getPendingActions($id = null)
 	{
 		if ( !isset($id) ) {
 			$id = $this->GetID();
 		}
 
 		$pending_actions = $this->Application->RecallVar($this->_getPendingActionVariableName());
 		$pending_actions = $pending_actions ? unserialize($pending_actions) : Array ();
 
 		if ( is_numeric($id) ) {
 			// filter by given/current id
 			$ret = Array ();
 
 			foreach ($pending_actions as $pending_action) {
 				if ( $pending_action['id'] == $id ) {
 					$ret[] = $pending_action;
 				}
 			}
 
 			return $ret;
 		}
 
 		return $pending_actions;
 	}
 
 	/**
 	 * Sets new pending actions
 	 *
 	 * @param Array|null $new_pending_actions
 	 * @param mixed $id
 	 * @return void
 	 * @access public
 	 */
 	public function setPendingActions($new_pending_actions = null, $id = null)
 	{
 		if ( !isset($new_pending_actions) ) {
 			$new_pending_actions = Array ();
 		}
 
 		if ( !isset($id) ) {
 			$id = $this->GetID();
 		}
 
 		$pending_actions = Array ();
 		$old_pending_actions = $this->getPendingActions(true);
 
 		if ( is_numeric($id) ) {
 			// remove old actions for this id
 			foreach ($old_pending_actions as $pending_action) {
 				if ( $pending_action['id'] != $id ) {
 					$pending_actions[] = $pending_action;
 				}
 			}
 
 			// add new actions for this id
 			$pending_actions = array_merge($pending_actions, $new_pending_actions);
 		}
 		else {
 			$pending_actions = $new_pending_actions;
 		}
 
 		// save changes
 		$var_name = $this->_getPendingActionVariableName();
 
 		if ( !$pending_actions ) {
 			$this->Application->RemoveVar($var_name);
 		}
 		else {
 			$this->Application->StoreVar($var_name, serialize($this->sortPendingActions($pending_actions)));
 		}
 	}
 
 	/**
 	 * Sorts pending actions the way, that `delete` action will come before other actions.
 	 *
 	 * @param array $pending_actions Pending actions.
 	 *
 	 * @return array
 	 */
 	protected function sortPendingActions(array $pending_actions)
 	{
 		usort($pending_actions, array($this, 'comparePendingActions'));
 
 		return $pending_actions;
 	}
 
 	protected function comparePendingActions($pending_action_a, $pending_action_b)
 	{
 		if ( $pending_action_a['action'] == $pending_action_b['action'] ) {
 			return 0;
 		}
 
 		return $pending_action_a['action'] == 'delete' ? -1 : 1;
 	}
 
 	/**
 	 * Allows to skip certain fields from getting into sql queries
 	 *
 	 * @param string $field_name
 	 * @param mixed $force_id
 	 * @return bool
 	 */
 	public function skipField($field_name, $force_id = false)
 	{
 		$skip = false;
 
 		// 1. skipping 'virtual' field
 		$skip = $skip || array_key_exists($field_name, $this->VirtualFields);
 
 		// 2. don't write empty field value to db, when "skip_empty" option is set
 		$field_value = array_key_exists($field_name, $this->FieldValues) ? $this->FieldValues[$field_name] : false;
 
 		if (array_key_exists($field_name, $this->Fields)) {
 			$skip_empty = array_key_exists('skip_empty', $this->Fields[$field_name]) ? $this->Fields[$field_name]['skip_empty'] : false;
 		}
 		else {
 			// field found in database, but not declared in unit config
 			$skip_empty = false;
 		}
 
 		$skip = $skip || (!$field_value && $skip_empty);
 
 		// 3. skipping field not in Fields (nor virtual, nor real)
 		$skip = $skip || !array_key_exists($field_name, $this->Fields);
 
 		return $skip;
 	}
 
 	/**
 	 * Updates previously loaded record with current item' values
 	 *
 	 * @access public
 	 * @param int $id Primary Key Id to update
 	 * @param Array $update_fields
 	 * @param bool $system_update
 	 * @return bool
 	 * @access public
 	 */
 	public function Update($id = null, $update_fields = null, $system_update = false)
 	{
 		if ( isset($id) ) {
 			$this->setID($id);
 		}
 
 		if ( !$this->raiseEvent('OnBeforeItemUpdate') ) {
 			return false;
 		}
 
 		if ( !isset($this->ID) ) {
 			// ID could be set inside OnBeforeItemUpdate event, so don't combine this check with previous one
 			return false;
 		}
 
 		// validate before updating
 		if ( !$this->Validate() ) {
 			return false;
 		}
 
 		if ( !$this->FieldValues ) {
 			// nothing to update
 			return true;
 		}
 
 		$sql = '';
 
 		$set_fields = isset($update_fields) ? $update_fields : array_keys($this->FieldValues);
 
 		foreach ($set_fields as $field_name) {
 			if ( $this->skipField($field_name) ) {
 				continue;
 			}
 
 			$field_value = $this->FieldValues[$field_name];
 
 			if ( is_null($field_value) ) {
 				if ( array_key_exists('not_null', $this->Fields[$field_name]) && $this->Fields[$field_name]['not_null'] ) {
 					// "kFormatter::Parse" methods converts empty values to NULL and for
 					// not-null fields they are replaced with default value here
 					$field_value = $this->Fields[$field_name]['default'];
 				}
 			}
 
 			$sql .= '`' . $field_name . '` = ' . $this->Conn->qstr($field_value) . ', ';
 		}
 
 		$sql = 'UPDATE ' . $this->TableName . '
 				SET ' . substr($sql, 0, -2) . '
 				WHERE ' . $this->GetKeyClause('update');
 
 		if ( $this->Conn->ChangeQuery($sql) === false ) {
 			// there was and sql error
 			$this->SetError($this->IDField, 'sql_error', '#' . $this->Conn->getErrorCode() . ': ' . $this->Conn->getErrorMsg());
 			return false;
 		}
 
 		$affected_rows = $this->Conn->getAffectedRows();
 
 		if ( !$system_update && ($affected_rows > 0) ) {
 			$this->setModifiedFlag(ChangeLog::UPDATE);
 		}
 
 		$this->saveCustomFields();
 		$this->raiseEvent('OnAfterItemUpdate');
 
 		// Preserve OriginalFieldValues during recursive Update() method calls.
 		$this->Loaded = true;
 
 		if ( !$this->IsTempTable() ) {
 			$this->Application->resetCounters($this->TableName);
 		}
 
 		return true;
 	}
 
 	/**
 	 * Validates given field
 	 *
 	 * @param string $field
 	 * @return bool
 	 * @access public
 	 */
 	public function ValidateField($field)
 	{
 		$this->initValidator();
 
 		return $this->validator->ValidateField($field);
 	}
 
 	/**
 	 * Validate all item fields based on
 	 * constraints set in each field options
 	 * in config
 	 *
 	 * @return bool
 	 * @access private
 	 */
 	public function Validate()
 	{
 		if ( $this->IgnoreValidation ) {
 			return true;
 		}
 
 		$this->initValidator();
 
 		// will apply any custom validation to the item
 		$this->raiseEvent('OnBeforeItemValidate');
 
 		if ( $this->validator->Validate() ) {
 			// no validation errors
 			$this->raiseEvent('OnAfterItemValidate');
 
 			return true;
 		}
 
 		return false;
 	}
 
 	/**
 	 * Check if item has errors
 	 *
 	 * @param Array $skip_fields fields to skip during error checking
 	 * @return bool
 	 */
 	public function HasErrors($skip_fields = Array ())
 	{
 		if ( !is_object($this->validator) ) {
 			return false;
 		}
 
 		return $this->validator->HasErrors($skip_fields);
 	}
 
 	/**
 	 * Check if value is set for required field
 	 *
 	 * @param string $field field name
 	 * @param Array $params field options from config
 	 * @return bool
 	 * @access public
 	 * @todo Find a way to get rid of direct call from kMultiLanguage::UpdateMasterFields method
 	 */
 	public function ValidateRequired($field, $params)
 	{
 		return $this->validator->ValidateRequired($field, $params);
 	}
 
 	/**
 	 * Return error message for field
 	 *
 	 * @param string $field
 	 * @param bool $force_escape
 	 * @return string
 	 * @access public
 	 */
 	public function GetErrorMsg($field, $force_escape = null)
 	{
 		if ( !is_object($this->validator) ) {
 			return '';
 		}
 
 		return $this->validator->GetErrorMsg($field, $force_escape);
 	}
 
 	/**
 	 * Returns field errors
 	 *
 	 * @return Array
 	 * @access public
 	 */
 	public function GetFieldErrors()
 	{
 		if ( !is_object($this->validator) ) {
 			return Array ();
 		}
 
 		return $this->validator->GetFieldErrors();
 	}
 
 	/**
 	 * Creates a record in the database table with current item' values
 	 *
 	 * @param mixed $force_id Set to TRUE to force creating of item's own ID or to value to force creating of passed id. Do not pass 1 for true, pass exactly TRUE!
 	 * @param bool $system_create
 	 * @return bool
 	 * @access public
 	 */
 	public function Create($force_id = false, $system_create = false)
 	{
 		if (!$this->raiseEvent('OnBeforeItemCreate')) {
 			return false;
 		}
 
 		// Validating fields before attempting to create record
 		if (!$this->Validate()) {
 			return false;
 		}
 
 		if (is_int($force_id)) {
 			$this->FieldValues[$this->IDField] = $force_id;
 		}
 		elseif (!$force_id || !is_bool($force_id)) {
 			$this->FieldValues[$this->IDField] = $this->generateID();
 		}
 
 		$fields_sql = '';
 		$values_sql = '';
 		foreach ($this->FieldValues as $field_name => $field_value) {
 			if ($this->skipField($field_name, $force_id)) {
 				continue;
 			}
 
 			if (is_null($field_value)) {
 				if (array_key_exists('not_null', $this->Fields[$field_name]) && $this->Fields[$field_name]['not_null']) {
 					// "kFormatter::Parse" methods converts empty values to NULL and for
 					// not-null fields they are replaced with default value here
 					$values_sql .= $this->Conn->qstr($this->Fields[$field_name]['default']);
 				}
 				else {
 					$values_sql .= $this->Conn->qstr($field_value);
 				}
 			}
 			else {
 				if (($field_name == $this->IDField) && ($field_value == 0) && !is_int($force_id)) {
 					// don't skip IDField in INSERT statement, just use DEFAULT keyword as it's value
 					$values_sql .= 'DEFAULT';
 				}
 				else {
 					$values_sql .= $this->Conn->qstr($field_value);
 				}
 			}
 
 			$fields_sql .= '`' . $field_name . '`, '; //Adding field name to fields block of Insert statement
 			$values_sql .= ', ';
 		}
 
 		$sql = 'INSERT INTO ' . $this->TableName . ' (' . substr($fields_sql, 0, -2) . ')
 				VALUES (' . substr($values_sql, 0, -2) . ')';
 
 		//Executing the query and checking the result
 		if ($this->Conn->ChangeQuery($sql) === false) {
 			$this->SetError($this->IDField, 'sql_error', '#' . $this->Conn->getErrorCode() . ': ' . $this->Conn->getErrorMsg());
 			return false;
 		}
 
 		$insert_id = $this->Conn->getInsertID();
 		if ($insert_id == 0) {
 			// insert into temp table (id is not auto-increment field)
 			$insert_id = $this->FieldValues[$this->IDField];
 		}
 
 		$temp_id = $this->GetID();
 		$this->setID($insert_id);
 
 		$this->OriginalFieldValues = $this->FieldValues;
 
 		if (!$system_create){
 			$this->setModifiedFlag(ChangeLog::CREATE);
 		}
 
 		$this->saveCustomFields();
 		if (!$this->IsTempTable()) {
 			$this->Application->resetCounters($this->TableName);
 		}
 
 		if ($this->IsTempTable() && ($this->Application->GetTopmostPrefix($this->Prefix) != $this->Prefix) && !is_int($force_id)) {
 			// temp table + subitem = set negative id
 			$this->setTempID();
 		}
 
 		$this->raiseEvent('OnAfterItemCreate', null, array('temp_id' => $temp_id));
 		$this->Loaded = true;
 
 		return true;
 	}
 
 	/**
 	 * Deletes the record from database
 	 *
 	 * @param int $id
 	 * @return bool
 	 * @access public
 	 */
 	public function Delete($id = null)
 	{
 		if ( isset($id) ) {
 			$this->setID($id);
 		}
 
 		if ( !$this->raiseEvent('OnBeforeItemDelete') ) {
 			return false;
 		}
 
 		$sql = 'DELETE FROM ' . $this->TableName . '
 				WHERE ' . $this->GetKeyClause('Delete');
 
 		$ret = $this->Conn->ChangeQuery($sql);
 		$affected_rows = $this->Conn->getAffectedRows();
 
 		if ( $affected_rows > 0 ) {
 			$this->setModifiedFlag(ChangeLog::DELETE); // will change affected rows, so get it before this line
 
 			// something was actually deleted
 			$this->raiseEvent('OnAfterItemDelete');
 		}
 
 		if ( !$this->IsTempTable() ) {
 			$this->Application->resetCounters($this->TableName);
 		}
 
 		return $ret;
 	}
 
 	public function PopulateMultiLangFields()
 	{
 		foreach ($this->Fields as $field => $options) {
 			// master field is set only for CURRENT language
 			$formatter = array_key_exists('formatter', $options) ? $options['formatter'] : false;
 
 			if ( ($formatter == 'kMultiLanguage') && isset($options['master_field']) && isset($options['error_field']) ) {
 				// MuliLanguage formatter sets error_field to master_field, but in PopulateMlFields mode,
 				// we display ML fields directly so we set it back to itself, otherwise error won't be displayed
 				unset( $this->Fields[$field]['error_field'] );
 			}
 		}
 	}
 
 	/**
 	 * Sets new name for item in case if it is being copied in same table
 	 *
 	 * @param array $master Table data from TempHandler
 	 * @param int $foreign_key ForeignKey value to filter name check query by
 	 * @param string $title_field FieldName to alter, by default - TitleField of the prefix
 	 * @param string $format sprintf-style format of renaming pattern, by default Copy %1$s of %2$s which makes it Copy [Number] of Original Name
 	 * @access public
 	 */
 	public function NameCopy($master=null, $foreign_key=null, $title_field=null, $format='Copy %1$s of %2$s')
 	{
 		if ( !isset($title_field) ) {
 			$title_field = $this->getUnitConfig()->getTitleField();
 
 			if ( !$title_field || isset($this->CalculatedFields[$title_field]) ) {
 				return;
 			}
 		}
 
 		$original_checked = false;
 		$new_name = $this->GetDBField($title_field);
 
 		do {
 			if ( preg_match('/' . sprintf($format, '([0-9]*) *', '(.*)') . '/', $new_name, $regs) ) {
 				$new_name = sprintf($format, ($regs[1] + 1), $regs[2]);
 			}
 			elseif ( $original_checked ) {
 				$new_name = sprintf($format, '', $new_name);
 			}
 
 			// if we are cloning in temp table this will look for names in temp table,
 			// since object' TableName contains correct TableName (for temp also!)
 			// if we are cloning live - look in live
 			$sql = 'SELECT ' . $title_field . '
 					FROM ' . $this->TableName . '
 					WHERE ' . $title_field . ' = ' . $this->Conn->qstr($new_name);
 
 			$foreign_key_field = getArrayValue($master, 'ForeignKey');
 			$foreign_key_field = is_array($foreign_key_field) ? $foreign_key_field[$master['ParentPrefix']] : $foreign_key_field;
 
 			if ( $foreign_key_field && isset($foreign_key) ) {
 				$sql .= ' AND ' . $foreign_key_field . ' = ' . $foreign_key;
 			}
 
 			$res = $this->Conn->GetOne($sql);
 
 			// if not found in live table, check in temp table if applicable
 			/*if ( $res === false && $this->Special == 'temp' ) {
 				$sql = 'SELECT ' . $name_field . '
 						FROM ' . $this->Application->GetTempName($master['TableName']) . '
 						WHERE ' . $name_field . ' = ' . $this->Conn->qstr($new_name);
 				$res = $this->Conn->GetOne($sql);
 			}*/
 
 			$original_checked = true;
 		} while ( $res !== false );
 
 		$this->SetDBField($title_field, $new_name);
 	}
 
 	protected function raiseEvent($name, $id = null, $additional_params = Array())
 	{
 		$additional_params['id'] = isset($id) ? $id : $this->GetID();
 		$event = new kEvent($this->getPrefixSpecial() . ':' . $name, $additional_params);
 
 		if ( is_object($this->parentEvent) ) {
 			$event->MasterEvent = $this->parentEvent;
 		}
 
 		$this->Application->HandleEvent($event);
 
 		return $event->status == kEvent::erSUCCESS;
 	}
 
 	/**
 	 * Set's new ID for item
 	 *
 	 * @param int $new_id
 	 * @access public
 	 */
 	public function setID($new_id)
 	{
 		$this->ID = $new_id;
 		$this->SetDBField($this->IDField, $new_id);
 	}
 
 	/**
 	 * Generate and set new temporary id
 	 *
 	 * @access private
 	 */
 	public function setTempID()
 	{
 		$new_id = (int)$this->Conn->GetOne('SELECT MIN(' . $this->IDField . ') FROM ' . $this->TableName);
 
 		if ( $new_id > 0 ) {
 			$new_id = 0;
 		}
 
 		--$new_id;
 
 		$this->Conn->Query('UPDATE ' . $this->TableName . ' SET `' . $this->IDField . '` = ' . $new_id . ' WHERE `' . $this->IDField . '` = ' . $this->GetID());
 
 		if ( $this->ShouldLogChanges(true) ) {
 			// Updating TempId in ChangesLog, if changes are disabled
 			$ses_var_name = $this->Application->GetTopmostPrefix($this->Prefix) . '_changes_' . $this->Application->GetTopmostWid($this->Prefix);
 			$changes = $this->Application->RecallVar($ses_var_name);
 			$changes = $changes ? unserialize($changes) : Array ();
 
 			if ( $changes ) {
 				foreach ($changes as $key => $rec) {
 					if ( $rec['Prefix'] == $this->Prefix && $rec['ItemId'] == $this->GetID() ) {
 						// change log for record, that's ID was just updated -> update in change log record too
 						$changes[$key]['ItemId'] = $new_id;
 					}
 
 					if ( $rec['MasterPrefix'] == $this->Prefix && $rec['MasterId'] == $this->GetID() ) {
 						// master item id was changed
 						$changes[$key]['MasterId'] = $new_id;
 					}
 
 					if ( in_array($this->Prefix, $rec['ParentPrefix']) && $rec['ParentId'][$this->Prefix] == $this->GetID() ) {
 						// change log record of given item's sub item -> update changed id's in dependent fields
 						$changes[$key]['ParentId'][$this->Prefix] = $new_id;
 
 						if ( array_key_exists('DependentFields', $rec) ) {
 							// these are fields from table of $rec['Prefix'] table!
 							// when one of dependent fields goes into id field of it's parent item, that was changed
 							$config = $this->Application->getUnitConfig($rec['Prefix']);
 
 							$parent_table_key = $config->getParentTableKey($this->Prefix);
 
 							if ( $parent_table_key == $this->IDField ) {
 								$foreign_key = $config->getForeignKey($this->Prefix);
 
 								$changes[$key]['DependentFields'][$foreign_key] = $new_id;
 							}
 						}
 					}
 				}
 			}
 
 			$this->Application->StoreVar($ses_var_name, serialize($changes));
 		}
 
 		$this->SetID($new_id);
 	}
 
 	/**
 	 * Set's modification flag for main prefix of current prefix to true
 	 *
 	 * @param int $mode
 	 * @access private
 	 */
 	public function setModifiedFlag($mode = null)
 	{
 		$main_prefix = $this->Application->GetTopmostPrefix($this->Prefix);
 		$this->Application->StoreVar($main_prefix . '_modified', '1', true); // true for optional
 
 		if ($this->ShouldLogChanges(true)) {
 			$this->LogChanges($main_prefix, $mode);
 
 			if (!$this->IsTempTable()) {
+				/** @var kDBEventHandler $handler */
 				$handler = $this->Application->recallObject($this->Prefix . '_EventHandler');
-				/* @var $handler kDBEventHandler */
 
 				$ses_var_name = $main_prefix . '_changes_' . $this->Application->GetTopmostWid($this->Prefix);
 				$handler->SaveLoggedChanges($ses_var_name, $this->ShouldLogChanges());
 			}
 		}
 	}
 
 	/**
 	 * Determines, that changes made to this item should be written to change log
 	 *
 	 * @param bool $log_changes
 	 * @return bool
 	 */
 	public function ShouldLogChanges($log_changes = null)
 	{
 		$config = $this->getUnitConfig();
 
 		if ( !isset($log_changes) ) {
 			// specific logging mode no forced -> use global logging settings
 			$log_changes = $config->getLogChanges() || $this->Application->ConfigValue('UseChangeLog');
 		}
 
 		return $log_changes && !$config->getForceDontLogChanges();
 	}
 
 	protected function LogChanges($main_prefix, $mode)
 	{
 		if ( !$mode ) {
 			return ;
 		}
 
 		$ses_var_name = $main_prefix . '_changes_' . $this->Application->GetTopmostWid($this->Prefix);
 		$changes = $this->Application->RecallVar($ses_var_name);
 		$changes = $changes ? unserialize($changes) : Array ();
 
 		$fields_hash = Array (
 			'Prefix' => $this->Prefix,
 			'ItemId' => $this->GetID(),
 			'OccuredOn' => time(),
 			'MasterPrefix' => $main_prefix,
 			'Action' => $mode,
 		);
 
 		if ( $this->Prefix == $main_prefix ) {
 			// main item
 			$fields_hash['MasterId'] = $this->GetID();
 			$fields_hash['ParentPrefix'] = Array ($main_prefix);
 			$fields_hash['ParentId'] = Array ($main_prefix => $this->GetID());
 		}
 		else {
 			// sub item
 			// collect foreign key values (for serial reset)
 			$config = $this->getUnitConfig();
 			$foreign_keys = $config->getForeignKey(null, Array ());
 			$dependent_fields = $fields_hash['ParentId'] = $fields_hash['ParentPrefix'] = Array ();
-			/* @var $foreign_keys Array */
+			/** @var Array $foreign_keys */
 
 			if ( is_array($foreign_keys) ) {
 				foreach ($foreign_keys as $prefix => $field_name) {
 					$dependent_fields[$field_name] = $this->GetDBField($field_name);
 					$fields_hash['ParentPrefix'][] = $prefix;
 					$fields_hash['ParentId'][$prefix] = $this->getParentId($prefix);
 				}
 			}
 			else {
 				$dependent_fields[$foreign_keys] = $this->GetDBField($foreign_keys);
 				$fields_hash['ParentPrefix'] = Array ( $config->getParentPrefix() );
 				$fields_hash['ParentId'][ $fields_hash['ParentPrefix'][0] ] = $this->getParentId('auto');
 			}
 
 			$fields_hash['DependentFields'] = $dependent_fields;
 
 
 			// works only, when main item is present in url, when sub-item is changed
 			$master_id = $this->Application->GetVar($main_prefix . '_id');
 
 			if ( $master_id === false ) {
 				// works in case of we are not editing topmost item, when sub-item is created/updated/deleted
 				$master_id = $this->getParentId('auto', true);
 			}
 
 			$fields_hash['MasterId'] = $master_id;
 		}
 
 		switch ( $mode ) {
 			case ChangeLog::UPDATE:
 				$to_save = array_merge($this->GetTitleField(), $this->GetChangedFields());
 				break;
 
 			case ChangeLog::CREATE:
 				$to_save = $this->GetTitleField();
 				break;
 
 			case ChangeLog::DELETE:
 				$to_save = array_merge($this->GetTitleField(), $this->GetRealFields());
 				break;
 
 			default:
 				$to_save = Array ();
 				break;
 		}
 
 		$fields_hash['Changes'] = serialize($to_save);
 		$changes[] = $fields_hash;
 
 		$this->Application->StoreVar($ses_var_name, serialize($changes));
 	}
 
 	/**
 	 * Returns current item parent's ID
 	 *
 	 * @param string $parent_prefix
 	 * @param bool $top_most return topmost parent, when used
 	 * @return int
 	 * @access public
 	 */
 	public function getParentId($parent_prefix, $top_most = false)
 	{
 		$current_id = $this->GetID();
 		$current_prefix = $this->Prefix;
 		$current_config = $this->Application->getUnitConfig($current_prefix);
 
 		if ( $parent_prefix == 'auto' ) {
 			$parent_prefix = $current_config->getParentPrefix();
 		}
 
 		if ( !$parent_prefix ) {
 			return $current_id;
 		}
 
 		do {
 			// field in this table
 			$foreign_key = $current_config->getForeignKey($parent_prefix);
 
 			// get foreign key value for $current_prefix
 			if ( $current_prefix == $this->Prefix ) {
 				$foreign_key_value = $this->GetDBField($foreign_key);
 			}
 			else {
 				$table_name = $current_config->getTableName();
 
 				if ( $this->IsTempTable() ) {
 					$table_name = $this->Application->GetTempName($table_name, 'prefix:' . $current_prefix);
 				}
 
 				$sql = 'SELECT ' . $foreign_key . '
 						FROM ' . $table_name . '
 						WHERE ' . $current_config->getIDField() . ' = ' . $current_id;
 				$foreign_key_value = $this->Conn->GetOne($sql);
 			}
 
 			// field in parent table
 			$parent_table_key = $current_config->getParentTableKey($parent_prefix);
 
 			$parent_config = $this->Application->getUnitConfig($parent_prefix);
 
 			$parent_id_field = $parent_config->getIDField();
 			$parent_table_name = $parent_config->getTableName();
 
 			if ( $this->IsTempTable() ) {
 				$parent_table_name = $this->Application->GetTempName($parent_table_name, 'prefix:' . $current_prefix);
 			}
 
 			if ( $parent_id_field == $parent_table_key ) {
 				// sub-item is related by parent item id field
 				$current_id = $foreign_key_value;
 			}
 			else {
 				// sub-item is related by other parent item field
 				$sql = 'SELECT ' . $parent_id_field . '
 						FROM ' . $parent_table_name . '
 						WHERE ' . $parent_table_key . ' = ' . $foreign_key_value;
 				$current_id = $this->Conn->GetOne($sql);
 			}
 
 			$current_prefix = $parent_prefix;
 			$current_config = $this->Application->getUnitConfig($current_prefix);
 
 			if ( !$top_most ) {
 				break;
 			}
 		} while ( $parent_prefix = $current_config->getParentPrefix() );
 
 		return $current_id;
 	}
 
 	/**
 	 * Returns title field (if any)
 	 *
 	 * @return Array
 	 */
 	public function GetTitleField()
 	{
 		$title_field = $this->getUnitConfig()->getTitleField();
 
 		if ( $title_field ) {
 			$value = $this->GetField($title_field);
 
 			return $value ? Array ($title_field => $value) : Array ();
 		}
 
 		return Array ();
 	}
 
 	/**
 	 * Returns only fields, that are present in database (no virtual and no calculated fields)
 	 *
 	 * @return Array
 	 */
 	public function GetRealFields()
 	{
 		return array_diff_key($this->FieldValues, $this->VirtualFields, $this->CalculatedFields);
 	}
 
 	/**
 	 * Returns only changed database field
 	 *
 	 * @param bool $include_virtual_fields
 	 * @return Array
 	 */
 	public function GetChangedFields($include_virtual_fields = false)
 	{
 		$changes = Array ();
 		$fields = $include_virtual_fields ? $this->FieldValues : $this->GetRealFields();
 		$diff = array_diff_assoc($fields, $this->OriginalFieldValues);
 
 		foreach ($diff as $field => $new_value) {
 			$old_value = $this->GetOriginalField($field, true);
 			$new_value = $this->GetField($field);
 
 			if ($old_value != $new_value) {
 				// "0.00" and "0.0000" are stored as strings and will differ. Double check to prevent that.
 				$changes[$field] = Array ('old' => $old_value, 'new' => $new_value);
 			}
 		}
 
 		return $changes;
 	}
 
 	/**
 	 * Returns ID of currently processed record
 	 *
 	 * @return int
 	 * @access public
 	 */
 	public function GetID()
 	{
 		return $this->ID;
 	}
 
 	/**
 	 * Generates ID for new items before inserting into database
 	 *
 	 * @return int
 	 * @access private
 	 */
 	protected function generateID()
 	{
 		return 0;
 	}
 
 	/**
 	 * Returns true if item was loaded successfully by Load method
 	 *
 	 * @return bool
 	 */
 	public function isLoaded()
 	{
 		return $this->Loaded;
 	}
 
 	/**
 	 * Checks if field is required
 	 *
 	 * @param string $field
 	 * @return bool
 	 */
 	public function isRequired($field)
 	{
 		return isset($this->Fields[$field]['required']) && $this->Fields[$field]['required'];
 	}
 
 	/**
 	 * Sets new required flag to field
 	 *
 	 * @param mixed $fields
 	 * @param bool $is_required
 	 */
 	public function setRequired($fields, $is_required = true)
 	{
 		if ( !is_array($fields) ) {
 			$fields = explode(',', $fields);
 		}
 
 		foreach ($fields as $field) {
 			$this->Fields[$field]['required'] = $is_required;
 		}
 	}
 
 	/**
 	 * Removes all data from an object
 	 *
 	 * @param int $new_id
 	 * @return bool
 	 * @access public
 	 */
 	public function Clear($new_id = null)
 	{
 		$this->Loaded = false;
 		$this->FieldValues = $this->OriginalFieldValues = Array ();
 		$this->SetDefaultValues(); // will wear off kDBItem::setID effect, so set it later
 
 		if ( is_object($this->validator) ) {
 			$this->validator->reset();
 		}
 
 		$this->setID($new_id);
 
 		return $this->Loaded;
 	}
 
 	public function Query($force = false)
 	{
 		throw new Exception('<b>Query</b> method is called in class <strong>' . get_class($this) . '</strong> for prefix <strong>' . $this->getPrefixSpecial() . '</strong>');
 	}
 
 	protected function saveCustomFields()
 	{
 		if ( !$this->customFields || $this->inCloning ) {
 			return true;
 		}
 
 		$cdata_key = rtrim($this->Prefix . '-cdata.' . $this->Special, '.');
 
+		/** @var kDBItem $cdata */
 		$cdata = $this->Application->recallObject($cdata_key, null, Array ('skip_autoload' => true));
-		/* @var $cdata kDBItem */
 
 		$resource_id = $this->GetDBField('ResourceId');
 		$cdata->Load($resource_id, 'ResourceId');
 		$cdata->SetDBField('ResourceId', $resource_id);
 
+		/** @var kMultiLanguage $ml_formatter */
 		$ml_formatter = $this->Application->recallObject('kMultiLanguage');
-		/* @var $ml_formatter kMultiLanguage */
 
+		/** @var kMultiLanguageHelper $ml_helper */
 		$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
-		/* @var $ml_helper kMultiLanguageHelper */
 
 		$languages = $ml_helper->getLanguages();
 
 		foreach ($this->customFields as $custom_id => $custom_name) {
 			$force_primary = $cdata->GetFieldOption('cust_' . $custom_id, 'force_primary');
 
 			if ( $force_primary ) {
 				$cdata->SetDBField($ml_formatter->LangFieldName('cust_' . $custom_id, true), $this->GetDBField('cust_' . $custom_name));
 			}
 			else {
 				foreach ($languages as $language_id) {
 					$cdata->SetDBField('l' . $language_id . '_cust_' . $custom_id, $this->GetDBField('l' . $language_id . '_cust_' . $custom_name));
 				}
 			}
 		}
 
 		return $cdata->isLoaded() ? $cdata->Update() : $cdata->Create();
 	}
 
 	/**
 	 * Returns specified field value from all selected rows.
 	 * Don't affect current record index
 	 *
 	 * @param string $field
 	 * @param bool $formatted
 	 * @param string $format
 	 * @return Array
 	 */
 	public function GetCol($field, $formatted = false, $format = null)
 	{
 		if ($formatted) {
 			return Array (0 => $this->GetField($field, $format));
 		}
 
 		return Array (0 => $this->GetDBField($field));
 	}
 
 	/**
 	 * Set's loaded status of object
 	 *
 	 * @param bool $is_loaded
 	 * @access public
 	 * @todo remove this method, since item can't be marked as loaded externally
 	 */
 	public function setLoaded($is_loaded = true)
 	{
 		$this->Loaded = $is_loaded;
 	}
 
 	/**
 	 * Returns parser parameters, used to identify this object in the e-mail template.
 	 *
 	 * @param array $merge_with Original send params to merge with.
 	 *
 	 * @return array
 	 */
 	public function getEmailParams(array $merge_with = array())
 	{
 		$merge_with['item_id'] = $this->GetID();
 		$merge_with['PrefixSpecial'] = $this->getPrefixSpecial();
 
 		return $merge_with;
 	}
 }
Index: branches/5.3.x/core/kernel/db/cat_event_handler.php
===================================================================
--- branches/5.3.x/core/kernel/db/cat_event_handler.php	(revision 16518)
+++ branches/5.3.x/core/kernel/db/cat_event_handler.php	(revision 16519)
@@ -1,3099 +1,3100 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class kCatDBEventHandler extends kDBEventHandler {
 
 	/**
 	 * Allows to override standard permission mapping
 	 *
 	 * @return void
 	 * @access protected
 	 * @see kEventHandler::$permMapping
 	 */
 	protected function mapPermissions()
 	{
 		parent::mapPermissions();
 
 		$permissions = Array(
 			'OnSaveSettings' => Array ('self' => 'add|edit|advanced:import'),
 			'OnResetSettings' => Array ('self' => 'add|edit|advanced:import'),
 			'OnBeforeDeleteOriginal' => Array ('self' => 'edit|advanced:approve'),
 			'OnAfterDeleteOriginal' => Array ('self' => 'edit|advanced:approve'),
 
 			'OnCopy' => Array ('self' => true),
 			'OnDownloadFile' => Array ('self' => 'view'),
 			'OnCancelAction' => Array ('self' => true),
 			'OnItemBuild' => Array ('self' => true),
 			'OnMakeVote' => Array ('self' => true),
 			'OnReviewHelpful' => Array ('self' => true),
 		);
 
 		$this->permMapping = array_merge($this->permMapping, $permissions);
 	}
 
 	/**
 	 * Load item if id is available
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function LoadItem(kEvent $event)
 	{
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		$id = $this->getPassedID($event);
 
 		if ( $object->Load($id) ) {
+			/** @var Params $actions */
 			$actions = $this->Application->recallObject('kActions');
-			/* @var $actions Params */
 
 			$actions->Set($event->getPrefixSpecial() . '_id', $object->GetID());
 
 			$use_pending_editing = $event->getUnitConfig()->getUsePendingEditing();
 
 			if ( $use_pending_editing && $event->Special != 'original' ) {
 				$this->Application->SetVar($event->Prefix . '.original_id', $object->GetDBField('OrgId'));
 			}
 		}
 		else {
 			$object->setID($id);
 		}
 	}
 
 	/**
 	 * Checks user permission to execute given $event
 	 *
 	 * @param kEvent $event
 	 * @return bool
 	 * @access public
 	 */
 	public function CheckPermission(kEvent $event)
 	{
 		if ( !$this->Application->isAdmin ) {
 			if ( $event->Name == 'OnSetSortingDirect' ) {
 				// allow sorting on front event without view permission
 				return true;
 			}
 		}
 
 		if ( $event->Name == 'OnExport' ) {
 			// save category_id before doing export
 			$this->Application->LinkVar('m_cat_id');
 		}
 
 		if ( in_array($event->Name, $this->_getMassPermissionEvents()) ) {
 			$items = $this->_getPermissionCheckInfo($event);
 
+			/** @var kPermissionsHelper $perm_helper */
 			$perm_helper = $this->Application->recallObject('PermissionsHelper');
-			/* @var $perm_helper kPermissionsHelper */
 
 			if ( ($event->Name == 'OnSave') && array_key_exists(0, $items) ) {
 				// adding new item (ID = 0)
 				$perm_value = $perm_helper->AddCheckPermission($items[0]['CategoryId'], $event->Prefix) > 0;
 			}
 			else {
 				// leave only items, that can be edited
 				$ids = Array ();
 				$check_method = in_array($event->Name, Array ('OnMassDelete', 'OnCut')) ? 'DeleteCheckPermission' : 'ModifyCheckPermission';
 				foreach ($items as $item_id => $item_data) {
 					if ( $perm_helper->$check_method($item_data['CreatedById'], $item_data['CategoryId'], $event->Prefix) > 0 ) {
 						$ids[] = $item_id;
 					}
 				}
 
 				if ( !$ids ) {
 					// no items left for editing -> no permission
 					return $perm_helper->finalizePermissionCheck($event, false);
 				}
 
 				$perm_value = true;
 				$event->setEventParam('ids', $ids); // will be used later by "kDBEventHandler::StoreSelectedIDs" method
 			}
 
 			return $perm_helper->finalizePermissionCheck($event, $perm_value);
 		}
 
 		$export_events = array('OnSaveSettings', 'OnResetSettings', 'OnExportBegin');
 
 		if ( in_array($event->Name, $export_events) || ($event->Special == 'export' && $event->Name == 'OnNew') ) {
 			/** @var kPermissionsHelper $perm_helper */
 			$perm_helper = $this->Application->recallObject('PermissionsHelper');
 			$perm_value = $this->Application->CheckPermission('in-portal:main_import.view');
 
 			return $perm_helper->finalizePermissionCheck($event, $perm_value);
 		}
 
 		if ( $event->Name == 'OnProcessSelected' ) {
 			if ( $this->Application->RecallVar('dst_field') == 'ImportCategory' ) {
 				// when selecting target import category
 				return $this->Application->CheckPermission('in-portal:main_import.view');
 			}
 		}
 
 		return parent::CheckPermission($event);
 	}
 
 	/**
 	 * Returns events, that require item-based (not just event-name based) permission check
 	 *
 	 * @return Array
 	 */
 	function _getMassPermissionEvents()
 	{
 		return Array (
 			'OnEdit', 'OnSave', 'OnMassDelete', 'OnMassApprove',
 			'OnMassDecline', 'OnMassMoveUp', 'OnMassMoveDown',
 			'OnCut',
 		);
 	}
 
 	/**
 	 * Returns category item IDs, that require permission checking
 	 *
 	 * @param kEvent $event
 	 * @return string
 	 */
 	function _getPermissionCheckIDs($event)
 	{
 		if ($event->Name == 'OnSave') {
 			$selected_ids = implode(',', $this->getSelectedIDs($event, true));
 			if (!$selected_ids) {
 				$selected_ids = 0; // when saving newly created item (OnPreCreate -> OnPreSave -> OnSave)
 			}
 		}
 		else {
 			// OnEdit, OnMassDelete events, when items are checked in grid
 			$selected_ids = implode(',', $this->StoreSelectedIDs($event));
 		}
 
 		return $selected_ids;
 	}
 
 	/**
 	 * Returns information used in permission checking
 	 *
 	 * @param kEvent $event
 	 * @return Array
 	 */
 	function _getPermissionCheckInfo($event)
 	{
+		/** @var kPermissionsHelper $perm_helper */
 		$perm_helper = $this->Application->recallObject('PermissionsHelper');
-		/* @var $perm_helper kPermissionsHelper */
 
 		// when saving data from temp table to live table check by data from temp table
 		$item_ids = $this->_getPermissionCheckIDs($event);
 		$items = $perm_helper->GetCategoryItemData($event->Prefix, $item_ids, $event->Name == 'OnSave');
 
 		if (!$items) {
 			// when item not present in temp table, then permission is not checked, because there are no data in db to check
 			$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
 			list ($id, $fields_hash) = each($items_info);
 
 			if (array_key_exists('CategoryId', $fields_hash)) {
 				$item_category = $fields_hash['CategoryId'];
 			}
 			else {
 				$item_category = $this->Application->GetVar('m_cat_id');
 			}
 
 			$items[$id] = Array (
 				'CreatedById' => $this->Application->RecallVar('use_id'),
 				'CategoryId' => $item_category,
 			);
 		}
 
 		return $items;
 	}
 
 	/**
 	 * Add selected items to clipboard with mode = COPY (CLONE)
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnCopy($event)
 	{
 		$this->Application->RemoveVar('clipboard');
 
+		/** @var kClipboardHelper $clipboard_helper */
 		$clipboard_helper = $this->Application->recallObject('ClipboardHelper');
-		/* @var $clipboard_helper kClipboardHelper */
 
 		$clipboard_helper->setClipboard($event, 'copy', $this->StoreSelectedIDs($event));
 		$this->clearSelectedIDs($event);
 	}
 
 	/**
 	 * Add selected items to clipboard with mode = CUT
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnCut($event)
 	{
 		$this->Application->RemoveVar('clipboard');
+
+		/** @var kClipboardHelper $clipboard_helper */
 		$clipboard_helper = $this->Application->recallObject('ClipboardHelper');
-		/* @var $clipboard_helper kClipboardHelper */
 
 		$clipboard_helper->setClipboard($event, 'cut', $this->StoreSelectedIDs($event));
 		$this->clearSelectedIDs($event);
 	}
 
 	/**
 	 * Checks permission for OnPaste event
 	 *
 	 * @param kEvent $event
 	 * @return bool
 	 */
 	function _checkPastePermission($event)
 	{
+		/** @var kPermissionsHelper $perm_helper */
 		$perm_helper = $this->Application->recallObject('PermissionsHelper');
-		/* @var $perm_helper kPermissionsHelper */
 
 		$category_id = $this->Application->GetVar('m_cat_id');
 		if ($perm_helper->AddCheckPermission($category_id, $event->Prefix) == 0) {
 			// no items left for editing -> no permission
 			return $perm_helper->finalizePermissionCheck($event, false);
 		}
 
 		return true;
 	}
 
 	/**
 	 * Performs category item paste
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnPaste($event)
 	{
 		if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) || !$this->_checkPastePermission($event) ) {
 			$event->status = kEvent::erFAIL;
 			return;
 		}
 
 		$clipboard_data = $event->getEventParam('clipboard_data');
 
 		if ( !$clipboard_data['cut'] && !$clipboard_data['copy'] ) {
 			return;
 		}
 
 		if ( $clipboard_data['copy'] ) {
+			/** @var kTempTablesHandler $temp */
 			$temp = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
-			/* @var $temp kTempTablesHandler */
 
 			$this->Application->SetVar('ResetCatBeforeClone', 1); // used in "kCatDBEventHandler::OnBeforeClone"
 			$temp->CloneItems($event->Prefix, $event->Special, $clipboard_data['copy']);
 		}
 
 		if ( $clipboard_data['cut'] ) {
+			/** @var kCatDBItem $object */
 			$object = $this->Application->recallObject($event->getPrefixSpecial() . '.item', $event->Prefix, Array ('skip_autoload' => true));
-			/* @var $object kCatDBItem */
 
 			foreach ($clipboard_data['cut'] as $id) {
 				$object->Load($id);
 				$object->MoveToCat();
 			}
 		}
 	}
 
 	/**
 	 * Deletes all selected items.
 	 * Automatically recurse into sub-items using temp handler, and deletes sub-items
 	 * by calling its Delete method if sub-item has AutoDelete set to true in its config file
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnMassDelete(kEvent $event)
 	{
 		if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
 			$event->status = kEvent::erFAIL;
 			return;
 		}
 
 		$ids = $this->StoreSelectedIDs($event);
 
 		$to_delete = Array ();
 		$recycle_bin = $this->Application->ConfigValue('RecycleBinFolder');
 
 		if ( $recycle_bin ) {
+			/** @var CategoriesItem $rb */
 			$rb = $this->Application->recallObject('c.recycle', NULL, array ('skip_autoload' => true));
-			/* @var $rb CategoriesItem */
 
 			$rb->Load($recycle_bin);
 
+			/** @var kCatDBItem $object */
 			$object = $this->Application->recallObject($event->Prefix . '.recycleitem', NULL, Array ('skip_autoload' => true));
-			/* @var $object kCatDBItem */
 
 			foreach ($ids as $id) {
 				$object->Load($id);
 
 				if ( preg_match('/^' . preg_quote($rb->GetDBField('ParentPath'), '/') . '/', $object->GetDBField('ParentPath')) ) {
 					$to_delete[] = $id;
 					continue;
 				}
 
 				$object->MoveToCat($recycle_bin);
 			}
 
 			$ids = $to_delete;
 		}
 
+		/** @var kTempTablesHandler $temp_handler */
 		$temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
-		/* @var $temp_handler kTempTablesHandler */
 
 		$event->setEventParam('ids', $ids);
 		$this->customProcessing($event, 'before');
 		$ids = $event->getEventParam('ids');
 
 		if ( $ids ) {
 			$temp_handler->DeleteItems($event->Prefix, $event->Special, $ids);
 		}
 
 		$this->clearSelectedIDs($event);
 	}
 
 	/**
 	 * Return type clauses for list bulding on front
 	 *
 	 * @param kEvent $event
 	 * @return Array
 	 */
 	function getTypeClauses($event)
 	{
 		$types = $event->getEventParam('types');
 		$types = $types ? explode(',', $types) : Array ();
 
 		$except_types = $event->getEventParam('except');
 		$except_types = $except_types ? explode(',', $except_types) : Array ();
 
 		$type_clauses = Array();
 
 		$user_id = $this->Application->RecallVar('user_id');
 		$owner_field = $this->getOwnerField($event->Prefix);
 
 		$type_clauses['my_items']['include'] = '%1$s.'.$owner_field.' = '.$user_id;
 		$type_clauses['my_items']['except'] = '%1$s.'.$owner_field.' <> '.$user_id;
 		$type_clauses['my_items']['having_filter'] = false;
 
 		$type_clauses['pick']['include'] = '%1$s.EditorsPick = 1 AND '.TABLE_PREFIX.'CategoryItems.PrimaryCat = 1';
 		$type_clauses['pick']['except'] = '%1$s.EditorsPick! = 1 AND '.TABLE_PREFIX.'CategoryItems.PrimaryCat = 1';
 		$type_clauses['pick']['having_filter'] = false;
 
 		$type_clauses['hot']['include'] = '`IsHot` = 1 AND PrimaryCat = 1';
 		$type_clauses['hot']['except'] = '`IsHot`! = 1 AND PrimaryCat = 1';
 		$type_clauses['hot']['having_filter'] = true;
 
 		$type_clauses['pop']['include'] = '`IsPop` = 1 AND PrimaryCat = 1';
 		$type_clauses['pop']['except'] = '`IsPop`! = 1 AND PrimaryCat = 1';
 		$type_clauses['pop']['having_filter'] = true;
 
 		$type_clauses['new']['include'] = '`IsNew` = 1 AND PrimaryCat = 1';
 		$type_clauses['new']['except'] = '`IsNew`! = 1 AND PrimaryCat = 1';
 		$type_clauses['new']['having_filter'] = true;
 
 		$type_clauses['displayed']['include'] = '';
 		$displayed = $this->Application->GetVar($event->Prefix.'_displayed_ids');
 
 		if ($displayed) {
 			$id_field = $event->getUnitConfig()->getIDField();
 			$type_clauses['displayed']['except'] = '%1$s.'.$id_field.' NOT IN ('.$displayed.')';
 		}
 		else {
 			$type_clauses['displayed']['except'] = '';
 		}
 
 		$type_clauses['displayed']['having_filter'] = false;
 
 		if (in_array('search', $types) || in_array('search', $except_types)) {
 			$event_mapping = Array (
 				'simple'		=>	'OnSimpleSearch',
 				'subsearch'		=>	'OnSubSearch',
 				'advanced'		=>	'OnAdvancedSearch'
 			);
 
 			$keywords = $event->getEventParam('keyword_string');
 			$type = $this->Application->GetVar('search_type', 'simple');
 
 			if ( $keywords ) {
 				// processing keyword_string param of ListProducts tag
 				$this->Application->SetVar('keywords', $keywords);
 				$type = 'simple';
 			}
 
 			$search_event = $event_mapping[$type];
 			$this->$search_event($event);
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			/** @var kSearchHelper $search_helper */
 			$search_helper = $this->Application->recallObject('SearchHelper');
 
 			$search_sql = '	FROM ' . $search_helper->getSearchTable() . ' search_result
 							JOIN %1$s ON %1$s.ResourceId = search_result.ResourceId';
 			$sql = str_replace('FROM %1$s', $search_sql, $object->GetPlainSelectSQL());
 
 			$object->SetSelectSQL($sql);
 
 			$object->addCalculatedField('Relevance', 'search_result.Relevance');
 
 			$type_clauses['search']['include'] = 'PrimaryCat = 1 AND ('.TABLE_PREFIX.'Categories.Status = '.STATUS_ACTIVE.')';
 			$type_clauses['search']['except'] = 'PrimaryCat = 1 AND ('.TABLE_PREFIX.'Categories.Status = '.STATUS_ACTIVE.')';
 			$type_clauses['search']['having_filter'] = false;
 		}
 
 		if (in_array('related', $types) || in_array('related', $except_types)) {
 			$related_to = $event->getEventParam('related_to');
 
 			if (!$related_to) {
 				$related_prefix = $event->Prefix;
 			}
 			else {
 				$sql = 'SELECT Prefix
 						FROM '.TABLE_PREFIX.'ItemTypes
 						WHERE ItemName = '.$this->Conn->qstr($related_to);
 				$related_prefix = $this->Conn->GetOne($sql);
 			}
 
 			$rel_table = $this->Application->getUnitConfig('rel')->getTableName();
 			$item_type = (int)$event->getUnitConfig()->getItemType();
 
 			if ($item_type == 0) {
 				trigger_error('<strong>ItemType</strong> not defined for prefix <strong>' . $event->Prefix . '</strong>', E_USER_WARNING);
 			}
 
 			// process case, then this list is called inside another list
 			$prefix_special = $event->getEventParam('PrefixSpecial');
 
 			if (!$prefix_special) {
 				$prefix_special = $this->Application->Parser->GetParam('PrefixSpecial');
 			}
 
 			$id = false;
 
 			if ($prefix_special !== false) {
 				$processed_prefix = $this->Application->processPrefix($prefix_special);
 				if ($processed_prefix['prefix'] == $related_prefix) {
 					// printing related categories within list of items (not on details page)
+					/** @var kDBList $list */
 					$list = $this->Application->recallObject($prefix_special);
-					/* @var $list kDBList */
 
 					$id = $list->GetID();
 				}
 			}
 
 			if ($id === false) {
 				// printing related categories for single item (possibly on details page)
 				if ($related_prefix == 'c') {
 					$id = $this->Application->GetVar('m_cat_id');
 				}
 				else {
 					$id = $this->Application->GetVar($related_prefix . '_id');
 				}
 			}
 
+			/** @var kCatDBItem $p_item */
 			$p_item = $this->Application->recallObject($related_prefix.'.current', NULL, Array('skip_autoload' => true));
-			/* @var $p_item kCatDBItem */
 
 			$p_item->Load( (int)$id );
 
 			$p_resource_id = $p_item->GetDBField('ResourceId');
 
 			$sql = 'SELECT SourceId, TargetId FROM '.$rel_table.'
 					WHERE
 						(Enabled = 1)
 						AND (
 								(Type = 0 AND SourceId = '.$p_resource_id.' AND TargetType = '.$item_type.')
 								OR
 								(Type = 1
 									AND (
 											(SourceId = '.$p_resource_id.' AND TargetType = '.$item_type.')
 											OR
 											(TargetId = '.$p_resource_id.' AND SourceType = '.$item_type.')
 										)
 								)
 						)';
 
 			$related_ids_array = $this->Conn->Query($sql);
 			$related_ids = Array();
 
 			foreach ($related_ids_array as $record) {
 				$related_ids[] = $record[ $record['SourceId'] == $p_resource_id ? 'TargetId' : 'SourceId' ];
 			}
 
 			if (count($related_ids) > 0) {
 				$type_clauses['related']['include'] = '%1$s.ResourceId IN ('.implode(',', $related_ids).') AND PrimaryCat = 1';
 				$type_clauses['related']['except'] = '%1$s.ResourceId NOT IN ('.implode(',', $related_ids).') AND PrimaryCat = 1';
 			}
 			else {
 				$type_clauses['related']['include'] = '0';
 				$type_clauses['related']['except'] = '1';
 			}
 
 			$type_clauses['related']['having_filter'] = false;
 		}
 
 		if (in_array('favorites', $types) || in_array('favorites', $except_types)) {
 			$sql = 'SELECT ResourceId
 					FROM ' . $this->Application->getUnitConfig('fav')->getTableName() . '
 					WHERE PortalUserId = '.$this->Application->RecallVar('user_id');
 			$favorite_ids = $this->Conn->GetCol($sql);
 
 			if ($favorite_ids) {
 				$type_clauses['favorites']['include'] = '%1$s.ResourceId IN ('.implode(',', $favorite_ids).') AND PrimaryCat = 1';
 				$type_clauses['favorites']['except'] = '%1$s.ResourceId NOT IN ('.implode(',', $favorite_ids).') AND PrimaryCat = 1';
 			}
 			else {
 				$type_clauses['favorites']['include'] = 0;
 				$type_clauses['favorites']['except'] = 1;
 			}
 
 			$type_clauses['favorites']['having_filter'] = false;
 		}
 
 		return $type_clauses;
 	}
 
 	/**
 	 * Returns SQL clause, that will help to select only data from specified category & it's children
 	 *
 	 * @param int $category_id
 	 * @return string
 	 */
 	function getCategoryLimitClause($category_id)
 	{
 		if (!$category_id) {
 			return false;
 		}
 
 		$tree_indexes = $this->Application->getTreeIndex($category_id);
 		if (!$tree_indexes) {
 			// id of non-existing category was given
 			return 'FALSE';
 		}
 
 		return TABLE_PREFIX.'Categories.TreeLeft BETWEEN '.$tree_indexes['TreeLeft'].' AND '.$tree_indexes['TreeRight'];
 	}
 
 	/**
 	 * Apply any custom changes to list's sql query
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 * @see kDBEventHandler::OnListBuild()
 	 */
 	protected function SetCustomQuery(kEvent $event)
 	{
 		parent::SetCustomQuery($event);
 
+		/** @var kCatDBList $object */
 		$object = $event->getObject();
-		/* @var $object kCatDBList */
 
 		// add category filter if needed
 		if ($event->Special != 'showall' && $event->Special != 'user') {
 			if ( (string)$event->getEventParam('parent_cat_id') !== '' ) {
 				$parent_cat_id = $event->getEventParam('parent_cat_id');
 			}
 			else {
 				$parent_cat_id = $this->Application->GetVar('c_id');
 				if (!$parent_cat_id) {
 					$parent_cat_id = $this->Application->GetVar('m_cat_id');
 				}
 				if (!$parent_cat_id) {
 					$parent_cat_id = 0;
 				}
 			}
 
 			if ("$parent_cat_id" == '0') {
 				// replace "0" category with "Content" category id (this way template
 				$parent_cat_id = $this->Application->getBaseCategory();
 			}
 
 			if ((string)$parent_cat_id != 'any') {
 				if ($event->getEventParam('recursive')) {
 					$filter_clause = $this->getCategoryLimitClause($parent_cat_id);
 					if ($filter_clause !== false) {
 						$object->addFilter('category_filter', $filter_clause);
 					}
 
 					$object->addFilter('primary_filter', 'PrimaryCat = 1');
 				}
 				else {
 					$object->addFilter('category_filter', TABLE_PREFIX.'CategoryItems.CategoryId = '.$parent_cat_id );
 				}
 			}
 			else {
 				$object->addFilter('primary_filter', 'PrimaryCat = 1');
 			}
 		}
 		else {
 			$object->addFilter('primary_filter', 'PrimaryCat = 1');
 
 			// if using recycle bin don't show items from there
 			$recycle_bin = $this->Application->ConfigValue('RecycleBinFolder');
 			if ($recycle_bin) {
 				$object->addFilter('recyclebin_filter', TABLE_PREFIX.'CategoryItems.CategoryId <> '.$recycle_bin);
 			}
 		}
 
 		if ($event->Special == 'user') {
 			$editable_user = $this->Application->GetVar('u_id');
 			$object->addFilter('owner_filter', '%1$s.'.$this->getOwnerField($event->Prefix).' = '.$editable_user);
 		}
 
 		$this->applyViewPermissionFilter($object);
 
 		$types = $event->getEventParam('types');
 		$this->applyItemStatusFilter($object, $types);
 
 		$except_types = $event->getEventParam('except');
 		$type_clauses = $this->getTypeClauses($event);
 
+		/** @var kSearchHelper $search_helper */
 		$search_helper = $this->Application->recallObject('SearchHelper');
-		/* @var $search_helper kSearchHelper */
 
 		$search_helper->SetComplexFilter($event, $type_clauses, $types, $except_types);
 	}
 
 	/**
 	 * Adds filter, that uses *.VIEW permissions to determine if an item should be shown to a user.
 	 *
 	 * @param kCatDBList $object Object.
 	 *
 	 * @return void
 	 * @access protected
 	 */
 	protected function applyViewPermissionFilter(kCatDBList $object)
 	{
 		if ( !$this->Application->ConfigValue('CheckViewPermissionsInCatalog') ) {
 			return;
 		}
 
 		if ( $this->Application->RecallVar('user_id') == USER_ROOT ) {
 			// for "root" CATEGORY.VIEW permission is checked for items lists too
 			$view_perm = 1;
 		}
 		else {
 			// for any real user item list view permission is checked instead of CATEGORY.VIEW
+			/** @var kCountHelper $count_helper */
 			$count_helper = $this->Application->recallObject('CountHelper');
-			/* @var $count_helper kCountHelper */
 
 			list ($view_perm, $view_filter) = $count_helper->GetPermissionClause($object->Prefix, 'perm');
 			$object->addFilter('perm_filter2', $view_filter);
 		}
 
 		$object->addFilter('perm_filter', 'perm.PermId = ' . $view_perm);
 	}
 
 	/**
 	 * Adds filter that filters out items with non-required statuses
 	 *
 	 * @param kDBList $object
 	 * @param string $types
 	 */
 	function applyItemStatusFilter(&$object, $types)
 	{
 		// Link1 (before modifications) [Status = 1, OrgId = NULL], Link2 (after modifications) [Status = -2, OrgId = Link1_ID]
 		$pending_editing = $object->getUnitConfig()->getUsePendingEditing();
 
 		if (!$this->Application->isAdminUser) {
 			$types = explode(',', $types);
 			if (in_array('my_items', $types)) {
 				$allow_statuses = Array (STATUS_ACTIVE, STATUS_PENDING, STATUS_PENDING_EDITING);
 				$object->addFilter('status_filter', '%1$s.Status IN ('.implode(',', $allow_statuses).')');
 
 				if ($pending_editing) {
 					$user_id = $this->Application->RecallVar('user_id');
 					$this->applyPendingEditingFilter($object, $user_id);
 				}
 			}
 			else {
 				$object->addFilter('status_filter', '(%1$s.Status = ' . STATUS_ACTIVE . ') AND (' . TABLE_PREFIX . 'Categories.Status = ' . STATUS_ACTIVE . ')');
 				if ($pending_editing) {
 					// if category item uses pending editing abilities, then in no cases show pending copies on front
 					$object->addFilter('original_filter', '%1$s.OrgId = 0 OR %1$s.OrgId IS NULL');
 				}
 			}
 		}
 		else {
 			if ($pending_editing) {
 				$this->applyPendingEditingFilter($object);
 			}
 		}
 	}
 
 	/**
 	 * Adds filter, that removes live items if they have pending editing copies
 	 *
 	 * @param kDBList $object
 	 * @param int $user_id
 	 */
 	function applyPendingEditingFilter(&$object, $user_id = NULL)
 	{
 		$sql = 'SELECT OrgId
 				FROM '.$object->TableName.'
 				WHERE Status = '.STATUS_PENDING_EDITING.' AND OrgId IS NOT NULL';
 
 		if (isset($user_id)) {
 			$owner_field = $this->getOwnerField($object->Prefix);
 			$sql .= ' AND '.$owner_field.' = '.$user_id;
 		}
 
 		$pending_ids = $this->Conn->GetCol($sql);
 		if ($pending_ids) {
 			$object->addFilter('no_original_filter', '%1$s.'.$object->IDField.' NOT IN ('.implode(',', $pending_ids).')');
 		}
 	}
 
 	/**
 	 * Adds calculates fields for item statuses
 	 *
 	 * @param kDBItem|kDBList $object
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function prepareObject(&$object, kEvent $event)
 	{
 		$this->prepareItemStatuses($event);
 		$object->addCalculatedField('CachedNavbar', 'l' . $this->Application->GetVar('m_lang') . '_CachedNavbar');
 
 		if ( $event->Special == 'export' || $event->Special == 'import' ) {
+			/** @var kCatDBItemExportHelper $export_helper */
 			$export_helper = $this->Application->recallObject('CatItemExportHelper');
-			/* @var $export_helper kCatDBItemExportHelper */
 
 			$export_helper->prepareExportColumns($event);
 		}
 	}
 
 	/**
 	 * Creates calculated fields for all item statuses based on config settings
 	 *
 	 * @param kEvent $event
 	 */
 	function prepareItemStatuses($event)
 	{
 		$object = $event->getObject( Array('skip_autoload' => true) );
 		$property_map = $event->getUnitConfig()->getItemPropertyMappings();
 
 		if (!$property_map) {
 			return ;
 		}
 
 		// new items
 		$object->addCalculatedField('IsNew', '	IF(%1$s.NewItem = 2,
 													IF(%1$s.CreatedOn >= (UNIX_TIMESTAMP() - ' . $this->Application->ConfigValue($property_map['NewDays']) . '*3600*24), 1, 0),
 													%1$s.NewItem
 												)');
 
 		// hot items (cache updated every hour)
 		if ($this->Application->isCachingType(CACHING_TYPE_MEMORY)) {
 			$serial_name = $this->Application->incrementCacheSerial($event->Prefix, NULL, false);
 			$hot_limit = $this->Application->getCache($property_map['HotLimit'] . '[%' . $serial_name . '%]');
 		}
 		else {
 			$hot_limit = $this->Application->getDBCache($property_map['HotLimit']);
 		}
 
 		if ($hot_limit === false) {
 			$hot_limit = $this->CalculateHotLimit($event);
 		}
 
 		$object->addCalculatedField('IsHot', '	IF(%1$s.HotItem = 2,
 													IF(%1$s.'.$property_map['ClickField'].' >= '.$hot_limit.', 1, 0),
 													%1$s.HotItem
 												)');
 
 		// popular items
 		$object->addCalculatedField('IsPop', '	IF(%1$s.PopItem = 2,
 													IF(%1$s.CachedVotesQty >= ' . $this->Application->ConfigValue($property_map['MinPopVotes']) . ' AND %1$s.CachedRating >= ' . $this->Application->ConfigValue($property_map['MinPopRating']) . ', 1, 0),
 													%1$s.PopItem)');
 
 	}
 
 	/**
 	 * Calculates hot limit for current item's table
 	 *
 	 * @param kEvent $event
 	 * @return float
 	 * @access protected
 	 */
 	protected function CalculateHotLimit($event)
 	{
 		$config = $event->getUnitConfig();
 		$property_map = $config->getItemPropertyMappings();
 
 		if ( !$property_map ) {
 			return 0.00;
 		}
 
 		$click_field = $property_map['ClickField'];
 
 		$last_hot = $this->Application->ConfigValue($property_map['MaxHotNumber']) - 1;
 		$sql = 'SELECT ' . $click_field . '
 				FROM ' . $config->getTableName() . '
 				ORDER BY ' . $click_field . ' DESC
 				LIMIT ' . $last_hot . ', 1';
 		$res = $this->Conn->GetCol($sql);
 		$hot_limit = (double)array_shift($res);
 
 		if ( $this->Application->isCachingType(CACHING_TYPE_MEMORY) ) {
 			$serial_name = $this->Application->incrementCacheSerial($event->Prefix, NULL, false);
 			$this->Application->setCache($property_map['HotLimit'] . '[%' . $serial_name . '%]', $hot_limit);
 		}
 		else {
 			$this->Application->setDBCache($property_map['HotLimit'], $hot_limit, 3600);
 		}
 
 		return $hot_limit;
 	}
 
 	/**
 	 * Moves item to preferred category, updates item hits
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnBeforeItemUpdate(kEvent $event)
 	{
 		parent::OnBeforeItemUpdate($event);
 
+		/** @var kCatDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kCatDBItem */
 
 		// update hits field
 		$config = $event->getUnitConfig();
 		$property_map = $config->getUserProfileMapping();
 
 		if ( $property_map ) {
 			$click_field = $property_map['ClickField'];
 
 			if ( $this->Application->isAdminUser && ($this->Application->GetVar($click_field . '_original') !== false) && floor($this->Application->GetVar($click_field . '_original')) != $object->GetDBField($click_field) ) {
 				$sql = 'SELECT MAX(' . $click_field . ')
 						FROM ' . $config->getTableName() . '
 						WHERE FLOOR(' . $click_field . ') = ' . $object->GetDBField($click_field);
 				$hits = ($res = $this->Conn->GetOne($sql)) ? $res + 0.000001 : $object->GetDBField($click_field);
 
 				$object->SetDBField($click_field, $hits);
 			}
 		}
 
 		// change category
 		$target_category = $object->GetDBField('CategoryId');
 
 		if ( $object->GetOriginalField('CategoryId') != $target_category ) {
 			$object->MoveToCat($target_category);
 		}
 	}
 
 	/**
 	 * Occurs after loading item, 'id' parameter
 	 * allows to get id of item that was loaded
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnAfterItemLoad(kEvent $event)
 	{
 		parent::OnAfterItemLoad($event);
 
 		$special = substr($event->Special, -6);
 
+		/** @var kCatDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kCatDBItem */
 
 		if ( $special == 'import' || $special == 'export' ) {
 			$image_data = $object->getPrimaryImageData();
 
 			if ( $image_data ) {
 				$thumbnail_image = $image_data[$image_data['LocalThumb'] ? 'ThumbPath' : 'ThumbUrl'];
 				if ( $image_data['SameImages'] ) {
 					$full_image = '';
 				}
 				else {
 					$full_image = $image_data[$image_data['LocalImage'] ? 'LocalPath' : 'Url'];
 				}
 
 				$object->SetDBField('ThumbnailImage', $thumbnail_image);
 				$object->SetDBField('FullImage', $full_image);
 				$object->SetDBField('ImageAlt', $image_data['AltName']);
 			}
 		}
 
 		// substituting pending status value for pending editing
 		if ( $object->HasField('OrgId') && $object->GetDBField('OrgId') > 0 && $object->GetDBField('Status') == -2 ) {
 			$new_options = Array ();
 			$options = $object->GetFieldOption('Status', 'options', false, Array ());
 
 			foreach ($options as $key => $val) {
 				if ( $key == 2 ) {
 					$key = -2;
 				}
 
 				$new_options[$key] = $val;
 			}
 
 			$object->SetFieldOption('Status', 'options', $new_options);
 		}
 
 		if ( !$this->Application->isAdmin ) {
 			// linking existing images for item with virtual fields
+			/** @var ImageHelper $image_helper */
 			$image_helper = $this->Application->recallObject('ImageHelper');
-			/* @var $image_helper ImageHelper */
 
 			$image_helper->LoadItemImages($object);
 
 			// linking existing files for item with virtual fields
+			/** @var FileHelper $file_helper */
 			$file_helper = $this->Application->recallObject('FileHelper');
-			/* @var $file_helper FileHelper */
 
 			$file_helper->LoadItemFiles($object);
 		}
 
 		if ( $object->isVirtualField('MoreCategories') ) {
 			// set item's additional categories to virtual field (used in editing)
 			$item_categories = $this->getItemCategories($object->GetDBField('ResourceId'));
 			$object->SetDBField('MoreCategories', $item_categories ? '|' . implode('|', $item_categories) . '|' : '');
 		}
 	}
 
 	/**
 	 * Occurs after updating item
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnAfterItemUpdate(kEvent $event)
 	{
 		parent::OnAfterItemUpdate($event);
 
 		$this->CalculateHotLimit($event);
 
 		if ( substr($event->Special, -6) == 'import' ) {
 			$this->setCustomExportColumns($event);
 		}
 
+		/** @var kCatDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kCatDBItem */
 
 		if ( !$this->Application->isAdmin ) {
+			/** @var ImageHelper $image_helper */
 			$image_helper = $this->Application->recallObject('ImageHelper');
-			/* @var $image_helper ImageHelper */
 
 			// process image upload in virtual fields
 			$image_helper->SaveItemImages($object);
 
+			/** @var FileHelper $file_helper */
 			$file_helper = $this->Application->recallObject('FileHelper');
-			/* @var $file_helper FileHelper */
 
 			// process file upload in virtual fields
 			$file_helper->SaveItemFiles($object);
 
 			if ( $event->Special != '-item' ) {
 				// don't touch categories during cloning
 				$this->processAdditionalCategories($object, 'update');
 			}
 		}
 
 		$recycle_bin = $this->Application->ConfigValue('RecycleBinFolder');
 
 		if ( $this->Application->isAdminUser && $recycle_bin ) {
 			$sql = 'SELECT CategoryId
 					FROM ' . $this->Application->getUnitConfig('ci')->getTableName() . '
 					WHERE ItemResourceId = ' . $object->GetDBField('ResourceId') . ' AND PrimaryCat = 1';
 			$primary_category = $this->Conn->GetOne($sql);
 
 			if ( $primary_category == $recycle_bin ) {
 				$event->CallSubEvent('OnAfterItemDelete');
 			}
 		}
 
 		if ( $object->GetChangedFields() ) {
 			$now = time();
 			$object->SetDBField('Modified_date', $now);
 			$object->SetDBField('Modified_time', $now);
 			$object->SetDBField('ModifiedById', $this->Application->RecallVar('user_id'));
 		}
 	}
 
 	/**
 	 * Sets values for import process
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnAfterItemCreate(kEvent $event)
 	{
 		parent::OnAfterItemCreate($event);
 
+		/** @var kCatDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kCatDBItem */
 
 		if ( substr($event->Special, -6) == 'import' ) {
 			$this->setCustomExportColumns($event);
 		}
 
 		$object->assignPrimaryCategory();
 
 		if ( !$this->Application->isAdmin ) {
+			/** @var ImageHelper $image_helper */
 			$image_helper = $this->Application->recallObject('ImageHelper');
-			/* @var $image_helper ImageHelper */
 
 			// process image upload in virtual fields
 			$image_helper->SaveItemImages($object);
 
+			/** @var FileHelper $file_helper */
 			$file_helper = $this->Application->recallObject('FileHelper');
-			/* @var $file_helper FileHelper */
 
 			// process file upload in virtual fields
 			$file_helper->SaveItemFiles($object);
 
 			if ( $event->Special != '-item' ) {
 				// don't touch categories during cloning
 				$this->processAdditionalCategories($object, 'create');
 			}
 		}
 	}
 
 	/**
 	 * Make record to search log
 	 *
 	 * @param string $keywords
 	 * @param int $search_type 0 - simple search, 1 - advanced search
 	 */
 	function saveToSearchLog($keywords, $search_type = 0)
 	{
 		// don't save keywords for each module separately, just one time
 		// static variable can't help here, because each module uses it's own class instance !
 		if (!$this->Application->GetVar('search_logged')) {
 			$sql = 'UPDATE '.TABLE_PREFIX.'SearchLogs
 					SET Indices = Indices + 1
 					WHERE Keyword = '.$this->Conn->qstr($keywords).' AND SearchType = '.$search_type; // 0 - simple search, 1 - advanced search
 	        $this->Conn->Query($sql);
 	        if ($this->Conn->getAffectedRows() == 0) {
 	            $fields_hash = Array('Keyword' => $keywords, 'Indices' => 1, 'SearchType' => $search_type);
 	        	$this->Conn->doInsert($fields_hash, TABLE_PREFIX.'SearchLogs');
 	        }
 
 	        $this->Application->SetVar('search_logged', 1);
 		}
 	}
 
 	/**
 	 * Makes simple search for category items
 	 * based on keywords string
 	 *
 	 * @param kEvent $event
 	 */
 	function OnSimpleSearch($event)
 	{
 		$event->redirect = false;
 
 		$keywords = $this->Application->unescapeRequestVariable(trim($this->Application->GetVar('keywords')));
 
+		/** @var kHTTPQuery $query_object */
 		$query_object = $this->Application->recallObject('kHTTPQuery');
-		/* @var $query_object kHTTPQuery */
 
 		/** @var kSearchHelper $search_helper */
 		$search_helper = $this->Application->recallObject('SearchHelper');
 
 		$search_table = $search_helper->getSearchTable();
 		$sql = 'SHOW TABLES LIKE "'.$search_table.'"';
 
 		if(!isset($query_object->Get['keywords']) &&
 			!isset($query_object->Post['keywords']) &&
 			$this->Conn->Query($sql))
 		{
 			return; // used when navigating by pages or changing sorting in search results
 		}
 		if(!$keywords || strlen($keywords) < $this->Application->ConfigValue('Search_MinKeyword_Length'))
 		{
 			$search_helper->ensureEmptySearchTable();
 			$this->Application->SetVar('keywords_too_short', 1);
 			return; // if no or too short keyword entered, doing nothing
 		}
 
 		$this->Application->StoreVar('keywords', $keywords);
 
 		$this->saveToSearchLog($keywords, 0); // 0 - simple search, 1 - advanced search
 
 		$event->setPseudoClass('_List');
 
+		/** @var kDBList $object */
 		$object = $event->getObject();
-		/* @var $object kDBList */
 
 		$config = $event->getUnitConfig();
 
 		$this->Application->SetVar($event->getPrefixSpecial().'_Page', 1);
 		$lang = $this->Application->GetVar('m_lang');
 		$items_table = $config->getTableName();
 		$module_name = $this->Application->findModule('Var', $event->Prefix, 'Name');
 
 		$sql = 'SELECT *
 				FROM ' . $this->Application->getUnitConfig('confs')->getTableName() . '
 				WHERE ModuleName = ' . $this->Conn->qstr($module_name) . ' AND SimpleSearch = 1';
 		$search_config = $this->Conn->Query($sql, 'FieldName');
 
 		$field_list = array_keys($search_config);
 
 		$join_clauses = Array();
 
 		// field processing
 		$weight_sum = 0;
 
 		$alias_counter = 0;
 
 		$custom_fields = $config->getCustomFields();
 		if ($custom_fields) {
 			$custom_table = $this->Application->getUnitConfig($event->Prefix . '-cdata')->getTableName();
 			$join_clauses[] = '	LEFT JOIN '.$custom_table.' custom_data ON '.$items_table.'.ResourceId = custom_data.ResourceId';
 		}
 
 		// what field in search config becomes what field in sql (key - new field, value - old field (from searchconfig table))
 		$search_config_map = Array();
 
 		foreach ($field_list as $key => $field) {
 			$local_table = TABLE_PREFIX.$search_config[$field]['TableName'];
 			$weight_sum += $search_config[$field]['Priority']; // counting weight sum; used when making relevance clause
 
 			// processing multilingual fields
 			if ( !$search_config[$field]['CustomFieldId'] && $object->GetFieldOption($field, 'formatter') == 'kMultiLanguage' ) {
 				$field_list[$key.'_primary'] = 'l'.$this->Application->GetDefaultLanguageId().'_'.$field;
 				$field_list[$key] = 'l'.$lang.'_'.$field;
 
 				if (!isset($search_config[$field]['ForeignField'])) {
 					$field_list[$key.'_primary'] = $local_table.'.'.$field_list[$key.'_primary'];
 					$search_config_map[ $field_list[$key.'_primary'] ] = $field;
 				}
 			}
 
 			// processing fields from other tables
 			$foreign_field = $search_config[$field]['ForeignField'];
 
 			if ( $foreign_field ) {
 				$exploded = explode(':', $foreign_field, 2);
 				if ($exploded[0] == 'CALC') {
 					// ignoring having type clauses in simple search
 					unset($field_list[$key]);
 					continue;
 				}
 				else {
 					$multi_lingual = false;
 					if ($exploded[0] == 'MULTI') {
 						$multi_lingual = true;
 						$foreign_field = $exploded[1];
 					}
 
 					$exploded = explode('.', $foreign_field);	// format: table.field_name
 					$foreign_table = TABLE_PREFIX.$exploded[0];
 
 					$alias_counter++;
 					$alias = 't'.$alias_counter;
 
 					if ($multi_lingual) {
 						$field_list[$key] = $alias.'.'.'l'.$lang.'_'.$exploded[1];
 						$field_list[$key.'_primary'] = 'l'.$this->Application->GetDefaultLanguageId().'_'.$field;
 						$search_config_map[ $field_list[$key] ] = $field;
 						$search_config_map[ $field_list[$key.'_primary'] ] = $field;
 					}
 					else {
 						$field_list[$key] = $alias.'.'.$exploded[1];
 						$search_config_map[ $field_list[$key] ] = $field;
 					}
 
 					$join_clause = str_replace('{ForeignTable}', $alias, $search_config[$field]['JoinClause']);
 					$join_clause = str_replace('{LocalTable}', $items_table, $join_clause);
 
 					$join_clauses[] = '	LEFT JOIN '.$foreign_table.' '.$alias.'
 										ON '.$join_clause;
 				}
 			}
 			else {
 				// processing fields from local table
 				if ($search_config[$field]['CustomFieldId']) {
 					$local_table = 'custom_data';
 
 					// search by custom field value on current language
 					$custom_field_id = array_search($field_list[$key], $custom_fields);
 					$field_list[$key] = 'l'.$lang.'_cust_'.$custom_field_id;
 
 					// search by custom field value on primary language
 					$field_list[$key.'_primary'] = $local_table.'.l'.$this->Application->GetDefaultLanguageId().'_cust_'.$custom_field_id;
 					$search_config_map[ $field_list[$key.'_primary'] ] = $field;
 				}
 
 				$field_list[$key] = $local_table.'.'.$field_list[$key];
 				$search_config_map[ $field_list[$key] ] = $field;
 			}
 		}
 
 		// Keyword string processing.
 		$where_clause = Array ();
 		foreach ($field_list as $field) {
 			if (preg_match('/^' . preg_quote($items_table, '/') . '\.(.*)/', $field, $regs)) {
 				// local real field
 				$filter_data = $search_helper->getSearchClause($object, $regs[1], $keywords, false);
 				if ($filter_data) {
 					$where_clause[] = $filter_data['value'];
 				}
 			}
 			elseif (preg_match('/^custom_data\.(.*)/', $field, $regs)) {
 				$custom_field_name = 'cust_' . $search_config_map[$field];
 				$filter_data = $search_helper->getSearchClause($object, $custom_field_name, $keywords, false);
 				if ($filter_data) {
 					$where_clause[] = str_replace('`' . $custom_field_name . '`', $field, $filter_data['value']);
 				}
 			}
 			else {
 				$where_clause[] = $search_helper->buildWhereClause($keywords, Array ($field));
 			}
 		}
 
 		$where_clause = '((' . implode(') OR (', $where_clause) . '))'; // 2 braces for next clauses, see below!
 
 		$search_scope = $this->Application->GetVar('search_scope');
 		if ($search_scope == 'category') {
 			$category_id = $this->Application->GetVar('m_cat_id');
 			$category_filter = $this->getCategoryLimitClause($category_id);
 			if ($category_filter !== false) {
 				$join_clauses[] = ' LEFT JOIN '.TABLE_PREFIX.'CategoryItems ON '.TABLE_PREFIX.'CategoryItems.ItemResourceId = '.$items_table.'.ResourceId';
 				$join_clauses[] = ' LEFT JOIN '.TABLE_PREFIX.'Categories ON '.TABLE_PREFIX.'Categories.CategoryId = '.TABLE_PREFIX.'CategoryItems.CategoryId';
 
 				$where_clause = '('.$this->getCategoryLimitClause($category_id).') AND '.$where_clause;
 			}
 		}
 
 		$where_clause = $where_clause . ' AND (' . $items_table . '.Status = ' . STATUS_ACTIVE . ')';
 
 		if ($event->MasterEvent && $event->MasterEvent->Name == 'OnListBuild') {
 			$sub_search_ids = $event->MasterEvent->getEventParam('ResultIds');
 
 			if ( $sub_search_ids !== false ) {
 				if ( $sub_search_ids ) {
 					$where_clause .= 'AND (' . $items_table . '.ResourceId IN (' . implode(',', $sub_search_ids) . '))';
 				}
 				else {
 					$where_clause .= 'AND FALSE';
 				}
 			}
 		}
 
 		// making relevance clause
 		$positive_words = $search_helper->getPositiveKeywords($keywords);
 		$this->Application->StoreVar('highlight_keywords', serialize($positive_words));
 		$relevance_parts = Array();
 		reset($search_config);
 
 		foreach ($positive_words as $keyword_index => $positive_word) {
 			$positive_word = $search_helper->transformWildcards($positive_word);
 			$positive_words[$keyword_index] = $this->Conn->escape($positive_word);
 		}
 
 		foreach ($field_list as $field) {
 
 			if (!array_key_exists($field, $search_config_map)) {
 				$map_key = $search_config_map[$items_table . '.' . $field];
 			}
 			else {
 				$map_key = $search_config_map[$field];
 			}
 
 			$config_elem = $search_config[ $map_key ];
 			$weight = $config_elem['Priority'];
 
 			// search by whole words only ([[:<:]] - word boundary)
 			/*$relevance_parts[] = 'IF('.$field.' REGEXP "[[:<:]]('.implode(' ', $positive_words).')[[:>:]]", '.$weight.', 0)';
 			foreach ($positive_words as $keyword) {
 				$relevance_parts[] = 'IF('.$field.' REGEXP "[[:<:]]('.$keyword.')[[:>:]]", '.$weight.', 0)';
 			}*/
 
 			if ( count($positive_words) > 1 ) {
 				$condition = $field . ' LIKE "%' . implode(' ', $positive_words) . '%"';
 				$relevance_parts[] = 'IF(' . $condition . ', ' . $weight_sum . ', 0)';
 			}
 
 			// search by partial word matches too
 			foreach ( $positive_words as $keyword ) {
 				$relevance_parts[] = 'IF(' . $field . ' LIKE "%' . $keyword . '%", ' . $weight . ', 0)';
 			}
 		}
 
 		$relevance_parts = array_unique($relevance_parts);
 
 		$conf_postfix = $config->getSearchConfigPostfix();
 		$rel_keywords	= $this->Application->ConfigValue('SearchRel_Keyword_'.$conf_postfix)	/ 100;
 		$rel_pop		= $this->Application->ConfigValue('SearchRel_Pop_'.$conf_postfix)		/ 100;
 		$rel_rating		= $this->Application->ConfigValue('SearchRel_Rating_'.$conf_postfix)	/ 100;
 		$relevance_clause = '('.implode(' + ', $relevance_parts).') / '.$weight_sum.' * '.$rel_keywords;
 		if ($rel_pop && $object->isField('Hits')) {
 			$relevance_clause .= ' + (Hits + 1) / (MAX(Hits) + 1) * '.$rel_pop;
 		}
 		if ($rel_rating && $object->isField('CachedRating')) {
 			$relevance_clause .= ' + (CachedRating + 1) / (MAX(CachedRating) + 1) * '.$rel_rating;
 		}
 
 		// building final search query
 		if (!$this->Application->GetVar('do_not_drop_search_table')) {
 			$this->Conn->Query('DROP TABLE IF EXISTS '.$search_table); // erase old search table if clean k4 event
 			$this->Application->SetVar('do_not_drop_search_table', true);
 		}
 
 		$search_table_exists = $this->Conn->Query('SHOW TABLES LIKE "'.$search_table.'"');
 		if ($search_table_exists) {
 			$select_intro = 'INSERT INTO '.$search_table.' (Relevance, ItemId, ResourceId, ItemType, EdPick) ';
 		}
 		else {
 			$select_intro = 'CREATE TABLE '.$search_table.' AS ';
 		}
 
 		$edpick_clause = $config->getFieldByName('EditorsPick') ? $items_table.'.EditorsPick' : '0';
 
 		$sql = $select_intro.' SELECT '.$relevance_clause.' AS Relevance,
 							'.$items_table.'.'.$config->getIDField().' AS ItemId,
 							'.$items_table.'.ResourceId,
 							'.$config->getItemType().' AS ItemType,
 							 '.$edpick_clause.' AS EdPick
 					FROM '.$object->TableName.'
 					'.implode(' ', $join_clauses).'
 					WHERE '.$where_clause.'
 					GROUP BY '.$items_table.'.'.$config->getIDField().' ORDER BY Relevance DESC';
 
 		$this->Conn->Query($sql);
 
 		if ( !$search_table_exists ) {
 			$sql = 'ALTER TABLE ' . $search_table . '
 					ADD INDEX (ResourceId),
 					ADD INDEX (Relevance)';
 			$this->Conn->Query($sql);
 		}
 	}
 
 	/**
 	 * Enter description here...
 	 *
 	 * @param kEvent $event
 	 */
 	function OnSubSearch($event)
 	{
 		// keep search results from other items after doing a sub-search on current item type
 		$this->Application->SetVar('do_not_drop_search_table', true);
 
 		/** @var kSearchHelper $search_helper */
 		$search_helper = $this->Application->recallObject('SearchHelper');
 
 		$search_table = $search_helper->getSearchTable();
 		$sql = 'SHOW TABLES LIKE "' . $search_table . '"';
 		$ids = array();
 
 		if ( $this->Conn->Query($sql) ) {
 			$item_type = $event->getUnitConfig()->getItemType();
 
 			// 1. get ids to be used as search bounds
 			$sql = 'SELECT DISTINCT ResourceId
 					FROM ' . $search_table . '
 					WHERE ItemType = ' . $item_type;
 			$ids = $this->Conn->GetCol($sql);
 
 			// 2. delete previously found ids
 			$sql = 'DELETE FROM ' . $search_table . '
 					WHERE ItemType = ' . $item_type;
 			$this->Conn->Query($sql);
 		}
 
 		$event->setEventParam('ResultIds', $ids);
 		$event->CallSubEvent('OnSimpleSearch');
 	}
 
 	/**
 	 * Enter description here...
 	 *
 	 * @param kEvent $event
 	 * @todo Change all hardcoded Products table & In-Commerce module usage to dynamic usage from item config !!!
 	 */
 	function OnAdvancedSearch($event)
 	{
+		/** @var kHTTPQuery $query_object */
 		$query_object = $this->Application->recallObject('kHTTPQuery');
-		/* @var $query_object kHTTPQuery */
 
 		if ( !isset($query_object->Post['andor']) ) {
 			// used when navigating by pages or changing sorting in search results
 			return;
 		}
 
 		$this->Application->RemoveVar('keywords');
 		$this->Application->RemoveVar('Search_Keywords');
 
 		$module_name = $this->Application->findModule('Var', $event->Prefix, 'Name');
 
 		$sql = 'SELECT *
 				FROM '.$this->Application->getUnitConfig('confs')->getTableName().'
 				WHERE (ModuleName = '.$this->Conn->qstr($module_name).') AND (AdvancedSearch = 1)';
 		$search_config = $this->Conn->Query($sql);
 
 		$lang = $this->Application->GetVar('m_lang');
 
+		/** @var kDBList $object */
 		$object = $event->getObject();
-		/* @var $object kDBList */
 
 		$object->SetPage(1);
 
 		$config = $event->getUnitConfig();
 		$items_table = $config->getTableName();
 
 		$search_keywords = $this->Application->GetVar('value'); // will not be changed
 
 		$keywords = $this->Application->GetVar('value'); // will be changed down there
 		$verbs = $this->Application->GetVar('verb');
 		$glues = $this->Application->GetVar('andor');
 
 		$and_conditions = Array();
 		$or_conditions = Array();
 		$and_having_conditions = Array();
 		$or_having_conditions = Array();
 		$join_clauses = Array();
 		$highlight_keywords = Array();
 		$relevance_parts = Array();
 
 		$alias_counter = 0;
 
 		$custom_fields = $config->getCustomFields();
 		if ($custom_fields) {
 			$custom_table = $this->Application->getUnitConfig($event->Prefix . '-cdata')->getTableName();
 			$join_clauses[] = '	LEFT JOIN '.$custom_table.' custom_data ON '.$items_table.'.ResourceId = custom_data.ResourceId';
 		}
 
 		$search_log = '';
 		$weight_sum = 0;
 
 		// processing fields and preparing conditions
 		foreach ($search_config as $record) {
 			$field = $record['FieldName'];
 			$join_clause = '';
 			$condition_mode = 'WHERE';
 
 			// field processing
 			$local_table = TABLE_PREFIX.$record['TableName'];
 			$weight_sum += $record['Priority']; // counting weight sum; used when making relevance clause
 
 			// processing multilingual fields
 			if ( $object->GetFieldOption($field, 'formatter') == 'kMultiLanguage' ) {
 				$field_name = 'l'.$lang.'_'.$field;
 			}
 			else {
 				$field_name = $field;
 			}
 
 			// processing fields from other tables
 			$foreign_field = $record['ForeignField'];
 
 			if ( $foreign_field ) {
 				$exploded = explode(':', $foreign_field, 2);
 				if($exploded[0] == 'CALC')
 				{
 					$user_groups = $this->Application->RecallVar('UserGroups');
 					$field_name = str_replace('{PREFIX}', TABLE_PREFIX, $exploded[1]);
 					$join_clause = str_replace('{PREFIX}', TABLE_PREFIX, $record['JoinClause']);
 					$join_clause = str_replace('{USER_GROUPS}', $user_groups, $join_clause);
 					$join_clause = ' LEFT JOIN '.$join_clause;
 
 					$condition_mode = 'HAVING';
 				}
 				else {
 					$exploded = explode('.', $foreign_field);
 					$foreign_table = TABLE_PREFIX.$exploded[0];
 
 					if($record['CustomFieldId']) {
 						$exploded[1] = 'l'.$lang.'_'.$exploded[1];
 					}
 
 					$alias_counter++;
 					$alias = 't'.$alias_counter;
 
 					$field_name = $alias.'.'.$exploded[1];
 					$join_clause = str_replace('{ForeignTable}', $alias, $record['JoinClause']);
 					$join_clause = str_replace('{LocalTable}', $items_table, $join_clause);
 
 					if($record['CustomFieldId'])
 					{
 						$join_clause .= ' AND '.$alias.'.CustomFieldId='.$record['CustomFieldId'];
 					}
 					$join_clause = '	LEFT JOIN '.$foreign_table.' '.$alias.'
 										ON '.$join_clause;
 				}
 			}
 			else
 			{
 				// processing fields from local table
 				if ($record['CustomFieldId']) {
 					$local_table = 'custom_data';
 					$field_name = 'l'.$lang.'_cust_'.array_search($field_name, $custom_fields);
 				}
 
 				$field_name = $local_table.'.'.$field_name;
 			}
 
 			$condition = $this->getAdvancedSearchCondition($field_name, $record, $keywords, $verbs, $highlight_keywords);
 			if ($record['CustomFieldId'] && strlen($condition)) {
 				// search in primary value of custom field + value in current language
 				$field_name = $local_table.'.'.'l'.$this->Application->GetDefaultLanguageId().'_cust_'.array_search($field, $custom_fields);
 				$primary_condition = $this->getAdvancedSearchCondition($field_name, $record, $keywords, $verbs, $highlight_keywords);
 				$condition = '('.$condition.' OR '.$primary_condition.')';
 			}
 
 			if ($condition) {
 				if ($join_clause) {
 					$join_clauses[] = $join_clause;
 				}
 
 				$relevance_parts[] = 'IF('.$condition.', '.$record['Priority'].', 0)';
 				if ($glues[$field] == 1) { // and
 					if ($condition_mode == 'WHERE') {
 						$and_conditions[] = $condition;
 					}
 					else {
 						$and_having_conditions[] = $condition;
 					}
 				}
 				else { // or
 					if ($condition_mode == 'WHERE') {
 						$or_conditions[] = $condition;
 					}
 					else {
 						$or_having_conditions[] = $condition;
 					}
 				}
 
 				// create search log record
 				$search_log_data = Array('search_config' => $record, 'verb' => getArrayValue($verbs, $field), 'value' => ($record['FieldType'] == 'range') ? $search_keywords[$field.'_from'].'|'.$search_keywords[$field.'_to'] : $search_keywords[$field]);
 				$search_log[] = $this->Application->Phrase('la_Field').' "'.$this->getHuman('Field', $search_log_data).'" '.$this->getHuman('Verb', $search_log_data).' '.$this->Application->Phrase('la_Value').' '.$this->getHuman('Value', $search_log_data).' '.$this->Application->Phrase($glues[$field] == 1 ? 'lu_And' : 'lu_Or');
 			}
 		}
 
 		if ($search_log) {
 			$search_log = implode('<br />', $search_log);
 	    	$search_log = preg_replace('/(.*) '.preg_quote($this->Application->Phrase('lu_and'), '/').'|'.preg_quote($this->Application->Phrase('lu_or'), '/').'$/is', '\\1', $search_log);
 	    	$this->saveToSearchLog($search_log, 1); // advanced search
 		}
 
 		$this->Application->StoreVar('highlight_keywords', serialize($highlight_keywords));
 
 		// making relevance clause
 		if($relevance_parts)
 		{
 			$conf_postfix = $config->getSearchConfigPostfix();
 			$rel_keywords	= $this->Application->ConfigValue('SearchRel_Keyword_'.$conf_postfix)	/ 100;
 			$rel_pop		= $this->Application->ConfigValue('SearchRel_Pop_'.$conf_postfix)		/ 100;
 			$rel_rating		= $this->Application->ConfigValue('SearchRel_Rating_'.$conf_postfix)	/ 100;
 			$relevance_clause = '('.implode(' + ', $relevance_parts).') / '.$weight_sum.' * '.$rel_keywords;
 			$relevance_clause .= ' + (Hits + 1) / (MAX(Hits) + 1) * '.$rel_pop;
 			$relevance_clause .= ' + (CachedRating + 1) / (MAX(CachedRating) + 1) * '.$rel_rating;
 		}
 		else
 		{
 			$relevance_clause = '0';
 		}
 
 		// building having clause
 		if($or_having_conditions)
 		{
 			$and_having_conditions[] = '('.implode(' OR ', $or_having_conditions).')';
 		}
 		$having_clause = implode(' AND ', $and_having_conditions);
 		$having_clause = $having_clause ? ' HAVING '.$having_clause : '';
 
 		// building where clause
 		if($or_conditions)
 		{
 			$and_conditions[] = '('.implode(' OR ', $or_conditions).')';
 		}
 //		$and_conditions[] = $items_table.'.Status = 1';
 		$where_clause = implode(' AND ', $and_conditions);
 		if(!$where_clause)
 		{
 			if($having_clause)
 			{
 				$where_clause = '1';
 			}
 			else
 			{
 				$where_clause = '0';
 				$this->Application->SetVar('adv_search_error', 1);
 			}
 		}
 		$where_clause .= ' AND '.$items_table.'.Status = 1';
 
 		/** @var kSearchHelper $search_helper */
 		$search_helper = $this->Application->recallObject('SearchHelper');
 
 		// Building final search query.
 		$search_table = $search_helper->getSearchTable();
 		$this->Conn->Query('DROP TABLE IF EXISTS '.$search_table);
 
 		$id_field = $config->getIDField();
 		$pick_field = $config->getFieldByName('EditorsPick') ? $items_table.'.EditorsPick' : '0';
 
 		$sql = '	CREATE TABLE '.$search_table.'
 					SELECT 	'.$relevance_clause.' AS Relevance,
 							'.$items_table.'.'.$id_field.' AS ItemId,
 							'.$items_table.'.ResourceId AS ResourceId,
 							11 AS ItemType,
 							'.$pick_field.' AS EdPick
 					FROM '.$items_table.'
 					'.implode(' ', $join_clauses).'
 					WHERE '.$where_clause.'
 					GROUP BY '.$items_table.'.'.$id_field.
 					$having_clause;
 
 		$this->Conn->Query($sql);
 	}
 
 	function getAdvancedSearchCondition($field_name, $record, $keywords, $verbs, &$highlight_keywords)
 	{
 		$field = $record['FieldName'];
 
 		$condition_patterns = Array (
 			'any'			=> '%s LIKE %s',
 			'contains'		=> '%s LIKE %s',
 			'notcontains'	=> '(NOT (%1$s LIKE %2$s) OR %1$s IS NULL)',
 			'is'			=> '%s = %s',
 			'isnot'			=> '(%1$s != %2$s OR %1$s IS NULL)'
 		);
 
 		$condition = '';
 		switch ($record['FieldType']) {
 			case 'select':
 				$keywords[$field] = $this->Application->unescapeRequestVariable($keywords[$field]);
 				if ($keywords[$field]) {
 					$condition = sprintf($condition_patterns['is'], $field_name, $this->Conn->qstr( $keywords[$field] ));
 				}
 				break;
 
 			case 'multiselect':
 				$keywords[$field] = $this->Application->unescapeRequestVariable($keywords[$field]);
 				if ($keywords[$field]) {
 					$condition = Array ();
 					$values = explode('|', substr($keywords[$field], 1, -1));
 					foreach ($values as $selected_value) {
 						$condition[] = sprintf($condition_patterns['contains'], $field_name, $this->Conn->qstr('%|'.$selected_value.'|%'));
 					}
 					$condition = '('.implode(' OR ', $condition).')';
 				}
 				break;
 
 			case 'text':
 				$keywords[$field] = $this->Application->unescapeRequestVariable($keywords[$field]);
 
 				if (mb_strlen($keywords[$field]) >= $this->Application->ConfigValue('Search_MinKeyword_Length')) {
 					$highlight_keywords[] = $keywords[$field];
 					if (in_array($verbs[$field], Array('any', 'contains', 'notcontains'))) {
 						$keywords[$field] = '%'.strtr($keywords[$field], Array('%' => '\\%', '_' => '\\_')).'%';
 					}
 					$condition = sprintf($condition_patterns[$verbs[$field]], $field_name, $this->Conn->qstr( $keywords[$field] ));
 				}
 				break;
 
 			case 'boolean':
 				if ($keywords[$field] != -1) {
 					$config = $this->getUnitConfig();
 					$items_table = $config->getTableName();
 					$property_mappings = $config->getItemPropertyMappings();
 
 					switch ($field) {
 						case 'HotItem':
 							$hot_limit_var = getArrayValue($property_mappings, 'HotLimit');
 							if ($hot_limit_var) {
 								$hot_limit = (int)$this->Application->getDBCache($hot_limit_var);
 
 								$condition = 	'IF('.$items_table.'.HotItem = 2,
 												IF('.$items_table.'.Hits >= '.
 												$hot_limit.
 												', 1, 0), '.$items_table.'.HotItem) = '.$keywords[$field];
 							}
 							break;
 
 						case 'PopItem':
 							$votes2pop_var = getArrayValue($property_mappings, 'VotesToPop');
 							$rating2pop_var = getArrayValue($property_mappings, 'RatingToPop');
 							if ($votes2pop_var && $rating2pop_var) {
 								$condition = 'IF('.$items_table.'.PopItem = 2, IF('.$items_table.'.CachedVotesQty >= '.
 												$this->Application->ConfigValue($votes2pop_var).
 												' AND '.$items_table.'.CachedRating >= '.
 												$this->Application->ConfigValue($rating2pop_var).
 												', 1, 0), '.$items_table.'.PopItem) = '.$keywords[$field];
 							}
 							break;
 
 						case 'NewItem':
 							$new_days_var = getArrayValue($property_mappings, 'NewDays');
 							if ($new_days_var) {
 								$condition = 	'IF('.$items_table.'.NewItem = 2,
 												IF('.$items_table.'.CreatedOn >= (UNIX_TIMESTAMP() - '.
 												$this->Application->ConfigValue($new_days_var).
 												'*3600*24), 1, 0), '.$items_table.'.NewItem) = '.$keywords[$field];
 							}
 							break;
 
 						case 'EditorsPick':
 							$condition = $items_table.'.EditorsPick = '.$keywords[$field];
 							break;
 					}
 				}
 				break;
 
 			case 'range':
 				$range_conditions = Array();
 				if ($keywords[$field.'_from'] && !preg_match("/[^0-9]/i", $keywords[$field.'_from'])) {
 					$range_conditions[] = $field_name.' >= '.$keywords[$field.'_from'];
 				}
 				if ($keywords[$field.'_to'] && !preg_match("/[^0-9]/i", $keywords[$field.'_to'])) {
 					$range_conditions[] = $field_name.' <= '.$keywords[$field.'_to'];
 				}
 				if ($range_conditions) {
 					$condition = implode(' AND ', $range_conditions);
 				}
 				break;
 
 			case 'date':
 				if ($keywords[$field]) {
 					if (in_array($keywords[$field], Array('today', 'yesterday'))) {
 						$current_time = getdate();
 						$day_begin = mktime(0, 0, 0, $current_time['mon'], $current_time['mday'], $current_time['year']);
 						$time_mapping = Array('today' => $day_begin, 'yesterday' => ($day_begin - 86400));
 						$min_time = $time_mapping[$keywords[$field]];
 					}
 					else {
 						$time_mapping = Array (
 							'last_week' => 604800, 'last_month' => 2628000, 'last_3_months' => 7884000,
 							'last_6_months' => 15768000, 'last_year' => 31536000,
 						);
 						$min_time = time() - $time_mapping[$keywords[$field]];
 					}
 					$condition = $field_name.' > '.$min_time;
 				}
 				break;
 		}
 
 		return $condition;
 	}
 
 	/**
 	 * Returns human readable representation of searched data to be placed in search log
 	 * @param string $type
 	 * @param Array $search_data
 	 * @return string
 	 * @access protected
 	 */
 	protected function getHuman($type, $search_data)
 	{
 		// all 3 variables are retrieved from $search_data array
-		/* @var $search_config Array */
-		/* @var $verb string */
-		/* @var $value string */
+		/** @var Array $search_config */
+		/** @var string $verb */
+		/** @var string $value */
 
 		$type = ucfirst(strtolower($type));
 		extract($search_data, EXTR_SKIP);
 
 		switch ($type) {
 			case 'Field':
 				return $this->Application->Phrase($search_config['DisplayName']);
 				break;
 
 			case 'Verb':
 				return $verb ? $this->Application->Phrase('lu_advsearch_'.$verb) : '';
 				break;
 
 			case 'Value':
 				switch ($search_config['FieldType']) {
 					case 'date':
 						$values = Array(0 => 'lu_comm_Any', 'today' => 'lu_comm_Today',
 										'yesterday' => 'lu_comm_Yesterday', 'last_week' => 'lu_comm_LastWeek',
 										'last_month' => 'lu_comm_LastMonth', 'last_3_months' => 'lu_comm_Last3Months',
 										'last_6_months' => 'lu_comm_Last6Months', 'last_year' => 'lu_comm_LastYear');
 						$ret = $this->Application->Phrase($values[$value]);
 						break;
 
 					case 'range':
 						$value = explode('|', $value);
 						return $this->Application->Phrase('lu_comm_From').' "'.$value[0].'" '.$this->Application->Phrase('lu_comm_To').' "'.$value[1].'"';
 						break;
 
 					case 'boolean':
 						$values = Array(1 => 'lu_comm_Yes', 0 => 'lu_comm_No', -1 => 'lu_comm_Both');
 						$ret = $this->Application->Phrase($values[$value]);
 						break;
 
 					default:
 						$ret = $value;
 						break;
 
 				}
 				return '"'.$ret.'"';
 				break;
 		}
 
 		return '';
 	}
 
 	/**
 	 * Set's correct page for list based on data provided with event
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 * @see kDBEventHandler::OnListBuild()
 	 */
 	protected function SetPagination(kEvent $event)
 	{
+		/** @var kDBList $object */
 		$object = $event->getObject();
-		/* @var $object kDBList */
 
 		// get PerPage (forced -> session -> config -> 10)
 		$object->SetPerPage($this->getPerPage($event));
 
 		// main lists on Front-End have special get parameter for page
 		$page = $object->isMainList() ? $this->Application->GetVar('page') : false;
 
 		if ( !$page ) {
 			// page is given in "env" variable for given prefix
 			$page = $this->Application->GetVar($event->getPrefixSpecial() . '_Page');
 		}
 
 		if ( !$page && $event->Special ) {
 			// when not part of env, then variables like "prefix.special_Page" are
 			// replaced (by PHP) with "prefix_special_Page", so check for that too
 			$page = $this->Application->GetVar($event->getPrefixSpecial(true) . '_Page');
 		}
 
 		if ( !$object->isMainList() ) {
 			// main lists doesn't use session for page storing
 			$this->Application->StoreVarDefault($event->getPrefixSpecial() . '_Page', 1, true); // true for optional
 
 			if ( !$page ) {
 				if ( $this->Application->RewriteURLs() ) {
 					// when page not found by prefix+special, then try to search it without special at all
 					$page = $this->Application->GetVar($event->Prefix . '_Page');
 
 					if ( !$page ) {
 						// page not found in request -> get from session
 						$page = $this->Application->RecallVar($event->Prefix . '_Page');
 					}
 
 					if ( $page ) {
 						// page found in request -> store in session
 						$this->Application->StoreVar($event->getPrefixSpecial() . '_Page', $page, true); //true for optional
 					}
 				}
 				else {
 					// page not found in request -> get from session
 					$page = $this->Application->RecallVar($event->getPrefixSpecial() . '_Page');
 				}
 			}
 			else {
 				// page found in request -> store in session
 				$this->Application->StoreVar($event->getPrefixSpecial() . '_Page', $page, true); //true for optional
 			}
 
 			if ( !$event->getEventParam('skip_counting') ) {
 				// when stored page is larger, then maximal list page number
 				// (such case is also processed in kDBList::Query method)
 				$pages = $object->GetTotalPages();
 
 				if ( $page > $pages ) {
 					$page = 1;
 					$this->Application->StoreVar($event->getPrefixSpecial() . '_Page', 1, true);
 				}
 			}
 		}
 
 		$object->SetPage($page);
 	}
 
 /* === RELATED TO IMPORT/EXPORT: BEGIN === */
 
 	/**
 	 * Shows export dialog
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnExport(kEvent $event)
 	{
 		$selected_ids = $this->StoreSelectedIDs($event);
 		if ( implode(',', $selected_ids) == '' ) {
 			// K4 fix when no ids found bad selected ids array is formed
 			$selected_ids = false;
 		}
 
 		$selected_cats_ids = $this->Application->GetVar('export_categories');
 
 		$this->Application->StoreVar($event->Prefix . '_export_ids', $selected_ids ? implode(',', $selected_ids) : '');
 		$this->Application->StoreVar($event->Prefix . '_export_cats_ids', $selected_cats_ids);
 
+		/** @var kCatDBItemExportHelper $export_helper */
 		$export_helper = $this->Application->recallObject('CatItemExportHelper');
-		/* @var $export_helper kCatDBItemExportHelper */
 
 		$redirect_params = Array (
 			$this->Prefix . '.export_event' => 'OnNew',
 			'pass' => 'all,' . $this->Prefix . '.export'
 		);
 
 		$event->setRedirectParams($redirect_params);
 	}
 
 	/**
 	 * Performs each export step & displays progress percent
 	 *
 	 * @param kEvent $event
 	 */
 	function OnExportProgress($event)
 	{
+		/** @var kCatDBItemExportHelper $export_object */
 		$export_object = $this->Application->recallObject('CatItemExportHelper');
-		/* @var $export_object kCatDBItemExportHelper */
 
 		$action_method = 'perform'.ucfirst($event->Special);
 		$field_values = $export_object->$action_method($event);
 
 		// finish code is done from JS now
 		if ($field_values['start_from'] == $field_values['total_records']) {
 			if ($event->Special == 'import') {
 				$this->Application->StoreVar('PermCache_UpdateRequired', 1);
 
 				$event->SetRedirectParam('m_cat_id', $this->Application->RecallVar('ImportCategory'));
 				$event->SetRedirectParam('anchor', 'tab-' . $event->Prefix);
 
 				$event->redirect = 'catalog/catalog';
 			}
 			elseif ($event->Special == 'export') {
 				$event->redirect = $export_object->getModuleName($event) . '/' . $event->Special . '_finish';
 				$event->SetRedirectParam('pass', 'all');
 			}
 
 			return ;
 		}
 
 		$export_options = $export_object->loadOptions($event);
 		echo $export_options['start_from']  * 100 / $export_options['total_records'];
 
 		$event->status = kEvent::erSTOP;
 	}
 
 	/**
 	 * Returns specific to each item type columns only
 	 *
 	 * @param kEvent $event
 	 * @return Array
 	 * @access protected
 	 */
 	public function getCustomExportColumns(kEvent $event)
 	{
 		return Array (
 			'__VIRTUAL__ThumbnailImage'	=>	'ThumbnailImage',
 			'__VIRTUAL__FullImage' 		=>	'FullImage',
 			'__VIRTUAL__ImageAlt'		=>	'ImageAlt'
 		);
 	}
 
 	/**
 	 * Sets non standart virtual fields (e.g. to other tables)
 	 *
 	 * @param kEvent $event
 	 */
 	function setCustomExportColumns($event)
 	{
 		$this->restorePrimaryImage($event);
 	}
 
 	/**
 	 * Create/Update primary image record in info found in imported data
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function restorePrimaryImage($event)
 	{
+		/** @var kCatDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kCatDBItem */
 
 		if ( !$object->GetDBField('ThumbnailImage') && !$object->GetDBField('FullImage') ) {
 			return ;
 		}
 
 		$image_data = $object->getPrimaryImageData();
 
+		/** @var kDBItem $image */
 		$image = $this->Application->recallObject('img', NULL, Array ('skip_autoload' => true));
-		/* @var $image kDBItem */
 
 		if ( $image_data ) {
 			$image->Load($image_data['ImageId']);
 		}
 		else {
 			$image->Clear();
 			$image->SetDBField('Name', 'main');
 			$image->SetDBField('DefaultImg', 1);
 			$image->SetDBField('ResourceId', $object->GetDBField('ResourceId'));
 		}
 
 		if ( $object->GetDBField('ImageAlt') ) {
 			$image->SetDBField('AltName', $object->GetDBField('ImageAlt'));
 		}
 
 		if ( $object->GetDBField('ThumbnailImage') ) {
 			$thumbnail_field = $this->isURL($object->GetDBField('ThumbnailImage')) ? 'ThumbUrl' : 'ThumbPath';
 			$image->SetDBField($thumbnail_field, $object->GetDBField('ThumbnailImage'));
 			$image->SetDBField('LocalThumb', $thumbnail_field == 'ThumbPath' ? 1 : 0);
 		}
 
 		if ( !$object->GetDBField('FullImage') ) {
 			$image->SetDBField('SameImages', 1);
 		}
 		else {
 			$image->SetDBField('SameImages', 0);
 			$full_field = $this->isURL($object->GetDBField('FullImage')) ? 'Url' : 'LocalPath';
 			$image->SetDBField($full_field, $object->GetDBField('FullImage'));
 			$image->SetDBField('LocalImage', $full_field == 'LocalPath' ? 1 : 0);
 		}
 
 		if ( $image->isLoaded() ) {
 			$image->Update();
 		}
 		else {
 			$image->Create();
 		}
 	}
 
 	/**
 	 * Detects if image url is specified in a given path (instead of path on disk)
 	 *
 	 * @param string $path
 	 * @return bool
 	 * @access protected
 	 */
 	protected function isURL($path)
 	{
 		return preg_match('#(http|https)://(.*)#', $path);
 	}
 
 	/**
 	 * Prepares item for import/export operations
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnNew(kEvent $event)
 	{
 		parent::OnNew($event);
 
 		if ( $event->Special == 'import' || $event->Special == 'export' ) {
+			/** @var kCatDBItemExportHelper $export_helper */
 			$export_helper = $this->Application->recallObject('CatItemExportHelper');
-			/* @var $export_helper kCatDBItemExportHelper */
 
 			$export_helper->setRequiredFields($event);
 		}
 	}
 
 	/**
 	 * Process items selected in item_selector
 	 *
 	 * @param kEvent $event
 	 */
 	function OnProcessSelected($event)
 	{
 		$dst_field = $this->Application->RecallVar('dst_field');
 		$selected_ids = $this->Application->GetVar('selected_ids');
 
 		if ( $dst_field == 'ItemCategory' ) {
 			// Item Edit -> Categories Tab -> New Categories
+			/** @var kCatDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kCatDBItem */
 
 			$category_ids = explode(',', $selected_ids['c']);
 			foreach ($category_ids as $category_id) {
 				$object->assignToCategory($category_id);
 			}
 		}
 
 		if ($dst_field == 'ImportCategory') {
 			// Tools -> Import -> Item Import -> Select Import Category
 			$this->Application->StoreVar('ImportCategory', $selected_ids['c']);
 
 			$event->SetRedirectParam($event->getPrefixSpecial() . '_id', 0);
 			$event->SetRedirectParam($event->getPrefixSpecial() . '_event', 'OnExportBegin');
 		}
 
 		$event->SetRedirectParam('opener', 'u');
 	}
 
 	/**
 	 * Saves Import/Export settings to session
 	 *
 	 * @param kEvent $event
 	 */
 	function OnSaveSettings($event)
 	{
 		$event->redirect = false;
 		$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
 
 		if ( $items_info ) {
 			list($id, $field_values) = each($items_info);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject(Array ('skip_autoload' => true));
-			/* @var $object kDBItem */
 
 			$object->setID($id);
 			$object->SetFieldsFromHash($field_values);
 			$event->setEventParam('form_data', $field_values);
 
 			$field_values['ImportFilename'] = $object->GetDBField('ImportFilename'); //if upload formatter has renamed the file during moving !!!
 			$field_values['ImportSource'] = 2;
 			$field_values['ImportLocalFilename'] = $object->GetDBField('ImportFilename');
 			$items_info[$id] = $field_values;
 
 			$this->Application->StoreVar($event->getPrefixSpecial() . '_ItemsInfo', serialize($items_info));
 		}
 	}
 
 	/**
 	 * Saves Import/Export settings to session
 	 *
 	 * @param kEvent $event
 	 */
 	function OnResetSettings($event)
 	{
 		$this->Application->StoreVar('ImportCategory', $this->Application->getBaseCategory());
 	}
 
 	/**
 	 * Cancels item editing
 	 * @param kEvent $event
 	 * @return void
 	 * @todo Used?
 	 */
 	function OnCancelAction($event)
 	{
 		$event->redirect = $this->Application->GetVar('cancel_template');
 		$event->SetRedirectParam('pass', 'all,' . $event->getPrefixSpecial());
 	}
 
 /* === RELATED TO IMPORT/EXPORT: END === */
 
 	/**
 	 * Stores item's owner login into separate field together with id
 	 *
 	 * @param kEvent $event
 	 * @param string $id_field
 	 * @param string $cached_field
 	 */
 	function cacheItemOwner($event, $id_field, $cached_field)
 	{
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		$object->SetDBField($cached_field, $object->GetField($id_field));
 	}
 
 	/**
 	 * Saves edited item into temp table
 	 * If there is no id, new item is created in temp table
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnPreSave(kEvent $event)
 	{
 		parent::OnPreSave($event);
 
 		$use_pending_editing = $event->getUnitConfig()->getUsePendingEditing();
 
 		if ( $event->status == kEvent::erSUCCESS && $use_pending_editing ) {
 			// decision: clone or not clone
 
+			/** @var kCatDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kCatDBItem */
 
 			if ( $object->GetID() == 0 || $object->GetDBField('OrgId') > 0 ) {
 				// new items or cloned items shouldn't be cloned again
 				return ;
 			}
 
+			/** @var kPermissionsHelper $perm_helper */
 			$perm_helper = $this->Application->recallObject('PermissionsHelper');
-			/* @var $perm_helper kPermissionsHelper */
 
 			$owner_field = $this->getOwnerField($event->Prefix);
 
 			if ( $perm_helper->ModifyCheckPermission($object->GetDBField($owner_field), $object->GetDBField('CategoryId'), $event->Prefix) == 2 ) {
 
 				// 1. clone original item
+				/** @var kTempTablesHandler $temp_handler */
 				$temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
-				/* @var $temp_handler kTempTablesHandler */
 
 				$cloned_ids = $temp_handler->CloneItems($event->Prefix, $event->Special, Array ($object->GetID()), NULL, NULL, NULL, true);
 				$ci_table = $this->Application->GetTempName(TABLE_PREFIX . 'CategoryItems');
 
 				// 2. delete record from CategoryItems (about cloned item) that was automatically created during call of Create method of kCatDBItem
 				$sql = 'SELECT ResourceId
 						FROM ' . $object->TableName . '
 						WHERE ' . $object->IDField . ' = ' . $cloned_ids[0];
 				$clone_resource_id = $this->Conn->GetOne($sql);
 
 				$sql = 'DELETE FROM ' . $ci_table . '
 						WHERE ItemResourceId = ' . $clone_resource_id . ' AND PrimaryCat = 1';
 				$this->Conn->Query($sql);
 
 				// 3. copy main item categoryitems to cloned item
 				$sql = '	INSERT INTO ' . $ci_table . ' (CategoryId, ItemResourceId, PrimaryCat, ItemPrefix, Filename)
 							SELECT CategoryId, ' . $clone_resource_id . ' AS ItemResourceId, PrimaryCat, ItemPrefix, Filename
 							FROM ' . $ci_table . '
 							WHERE ItemResourceId = ' . $object->GetDBField('ResourceId');
 				$this->Conn->Query($sql);
 
 				// 4. put cloned id to OrgId field of item being cloned
 				$sql = 'UPDATE ' . $object->TableName . '
 						SET OrgId = ' . $object->GetID() . '
 						WHERE ' . $object->IDField . ' = ' . $cloned_ids[0];
 				$this->Conn->Query($sql);
 
 				// 5. substitute id of item being cloned with clone id
 				$this->Application->SetVar($event->getPrefixSpecial() . '_id', $cloned_ids[0]);
 
 				$selected_ids = $this->getSelectedIDs($event, true);
 				$selected_ids[ array_search($object->GetID(), $selected_ids) ] = $cloned_ids[0];
 				$this->StoreSelectedIDs($event, $selected_ids);
 
 				// 6. delete original item from temp table
 				$temp_handler->DeleteItems($event->Prefix, $event->Special, Array ($object->GetID()));
 			}
 		}
 	}
 
 	/**
 	 * Sets item's owner field
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnPreCreate(kEvent $event)
 	{
 		parent::OnPreCreate($event);
 
 		if ( $event->status != kEvent::erSUCCESS ) {
 			return ;
 		}
 
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		$owner_field = $this->getOwnerField($event->Prefix);
 		$object->SetDBField($owner_field, $this->Application->RecallVar('user_id'));
 	}
 
 	/**
 	 * Occurs before original item of item in pending editing got deleted (for hooking only)
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnBeforeDeleteOriginal(kEvent $event)
 	{
 
 	}
 
 	/**
 	 * Occurs after original item of item in pending editing got deleted (for hooking only)
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnAfterDeleteOriginal(kEvent $event)
 	{
 
 	}
 
 	/**
 	 * Occurs before an item has been cloned
 	 * Id of newly created item is passed as event' 'id' param
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnBeforeClone(kEvent $event)
 	{
 		parent::OnBeforeClone($event);
 
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		$object->SetDBField('ResourceId', 0); // this will reset it
 
 		if ( $this->Application->GetVar('ResetCatBeforeClone') ) {
 			$object->SetDBField('CategoryId', NULL);
 		}
 	}
 
 	/**
 	 * Set status for new category item based on user permission in category
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnBeforeItemCreate(kEvent $event)
 	{
 		parent::OnBeforeItemCreate($event);
 
+		/** @var kCatDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kCatDBItem */
 
 		$owner_field = $this->getOwnerField($event->Prefix);
 
 		// Don't allow creating records on behalf of another user.
 		if ( !$this->Application->isAdminUser && !defined('CRON') ) {
 			$object->SetDBField($owner_field, $object->GetOriginalField($owner_field));
 		}
 
 		// Auto-assign records to currently logged-in user.
 		if ( !$object->GetDBField($owner_field) ) {
 			$object->SetDBField($owner_field, $this->Application->RecallVar('user_id'));
 		}
 
 		if ( !$this->Application->isAdmin ) {
 			$this->setItemStatusByPermission($event);
 		}
 	}
 
 	/**
 	 * Sets category item status based on user permissions (only on Front-end)
 	 *
 	 * @param kEvent $event
 	 */
 	function setItemStatusByPermission($event)
 	{
 		$use_pending_editing = $event->getUnitConfig()->getUsePendingEditing();
 
 		if (!$use_pending_editing) {
 			return ;
 		}
 
+		/** @var kCatDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kCatDBItem */
 
+		/** @var kPermissionsHelper $perm_helper */
 		$perm_helper = $this->Application->recallObject('PermissionsHelper');
-		/* @var $perm_helper kPermissionsHelper */
 
 		$primary_category = $object->GetDBField('CategoryId') > 0 ? $object->GetDBField('CategoryId') : $this->Application->GetVar('m_cat_id');
 		$item_status = $perm_helper->AddCheckPermission($primary_category, $event->Prefix);
 
 		if ($item_status == STATUS_DISABLED) {
 			$event->status = kEvent::erFAIL;
 		}
 		else {
 			$object->SetDBField('Status', $item_status);
 		}
 	}
 
 	/**
 	 * Creates category item & redirects to confirmation template (front-end only)
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnCreate(kEvent $event)
 	{
 		parent::OnCreate($event);
 
 		$this->SetFrontRedirectTemplate($event, 'suggest');
 	}
 
 	/**
 	 * Returns item's categories (allows to exclude primary category)
 	 *
 	 * @param int $resource_id
 	 * @param bool $with_primary
 	 * @return Array
 	 */
 	function getItemCategories($resource_id, $with_primary = false)
 	{
 		$sql = 'SELECT CategoryId
 				FROM '.TABLE_PREFIX.'CategoryItems
 				WHERE (ItemResourceId = '.$resource_id.')';
 
 		if (!$with_primary) {
 			$sql .= ' AND (PrimaryCat = 0)';
 		}
 
 		return $this->Conn->GetCol($sql);
 	}
 
 	/**
 	 * Adds new and removes old additional categories from category item
 	 *
 	 * @param kCatDBItem $object
 	 * @param int $mode
 	 */
 	function processAdditionalCategories(&$object, $mode)
 	{
 		if ( !$object->isVirtualField('MoreCategories') ) {
 			// given category item doesn't require such type of processing
 			return ;
 		}
 
 		$process_categories = $object->GetDBField('MoreCategories');
 		if ($process_categories === '') {
 			// field was not in submit & have default value (when no categories submitted, then value is null)
 			return ;
 		}
 
 		if ($mode == 'create') {
 			// prevents first additional category to become primary
 			$object->assignPrimaryCategory();
 		}
 
 		$process_categories = $process_categories ? explode('|', substr($process_categories, 1, -1)) : Array ();
 		$existing_categories = $this->getItemCategories($object->GetDBField('ResourceId'));
 
 		$add_categories = array_diff($process_categories, $existing_categories);
 		foreach ($add_categories as $category_id) {
 			$object->assignToCategory($category_id);
 		}
 
 		$remove_categories = array_diff($existing_categories, $process_categories);
 		foreach ($remove_categories as $category_id) {
 			$object->removeFromCategory($category_id);
 		}
 	}
 
 	/**
 	 * Creates category item & redirects to confirmation template (front-end only)
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnUpdate(kEvent $event)
 	{
 		$use_pending = $event->getUnitConfig()->getUsePendingEditing();
 		if ($this->Application->isAdminUser || !$use_pending) {
 			parent::OnUpdate($event);
 			$this->SetFrontRedirectTemplate($event, 'modify');
 			return ;
 		}
 
+		/** @var kCatDBItem $object */
 		$object = $event->getObject(Array('skip_autoload' => true));
-		/* @var $object kCatDBItem */
 
 		$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
 		if ($items_info) {
+			/** @var kPermissionsHelper $perm_helper */
 			$perm_helper = $this->Application->recallObject('PermissionsHelper');
-			/* @var $perm_helper kPermissionsHelper */
 
+			/** @var kTempTablesHandler $temp_handler */
 			$temp_handler = $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
-			/* @var $temp_handler kTempTablesHandler */
 
 			$owner_field = $this->getOwnerField($event->Prefix);
 
+			/** @var FileHelper $file_helper */
 			$file_helper = $this->Application->recallObject('FileHelper');
-			/* @var $file_helper FileHelper */
 
 			foreach ($items_info as $id => $field_values) {
 				$object->Load($id);
 				$edit_perm = $perm_helper->ModifyCheckPermission($object->GetDBField($owner_field), $object->GetDBField('CategoryId'), $event->Prefix);
 
 				if ($use_pending && !$object->GetDBField('OrgId') && ($edit_perm == STATUS_PENDING)) {
 					// pending editing enabled + not pending copy -> get/create pending copy & save changes to it
 					$original_id = $object->GetID();
 					$original_resource_id = $object->GetDBField('ResourceId');
 					$file_helper->PreserveItemFiles($field_values);
 
 					$object->Load($original_id, 'OrgId');
 					if (!$object->isLoaded()) {
 						// 1. user has no pending copy of live item -> clone live item
 						$cloned_ids = $temp_handler->CloneItems($event->Prefix, $event->Special, Array($original_id), NULL, NULL, NULL, true);
 
 						$object->Load($cloned_ids[0]);
 						$object->SetFieldsFromHash($field_values);
 						$event->setEventParam('form_data', $field_values);
 
 						// 1a. delete record from CategoryItems (about cloned item) that was automatically created during call of Create method of kCatDBItem
 						$ci_table = $this->Application->getUnitConfig('ci')->getTableName();
 						$sql = 'DELETE FROM '.$ci_table.'
 								WHERE ItemResourceId = '.$object->GetDBField('ResourceId').' AND PrimaryCat = 1';
 						$this->Conn->Query($sql);
 
 						// 1b. copy main item categoryitems to cloned item
 						$sql = 'INSERT INTO '.$ci_table.' (CategoryId, ItemResourceId, PrimaryCat, ItemPrefix, Filename)
 								SELECT CategoryId, '.$object->GetDBField('ResourceId').' AS ItemResourceId, PrimaryCat, ItemPrefix, Filename
 								FROM '.$ci_table.'
 								WHERE ItemResourceId = '.$original_resource_id;
 						$this->Conn->Query($sql);
 
 						// 1c. put cloned id to OrgId field of item being cloned
 						$object->SetDBField('Status', STATUS_PENDING_EDITING);
 						$object->SetDBField('OrgId', $original_id);
 					}
 					else {
 						// 2. user has pending copy of live item -> just update field values
 						$object->SetFieldsFromHash($field_values);
 						$event->setEventParam('form_data', $field_values);
 					}
 
 					// update id in request (used for redirect in mod-rewrite mode)
 					$this->Application->SetVar($event->getPrefixSpecial().'_id', $object->GetID());
 				}
 				else {
 					// 3. already editing pending copy -> just update field values
 					$object->SetFieldsFromHash($field_values);
 					$event->setEventParam('form_data', $field_values);
 				}
 
 				if ($object->Update()) {
 					$event->status = kEvent::erSUCCESS;
 				}
 				else {
 					$event->status = kEvent::erFAIL;
 					$event->redirect = false;
 					break;
 				}
 			}
 		}
 
 		$this->SetFrontRedirectTemplate($event, 'modify');
 	}
 
 	/**
 	 * Sets next template to one required for front-end after adding/modifying item
 	 *
 	 * @param kEvent $event
 	 * @param string $template_key - {suggest,modify}
 	 */
 	function SetFrontRedirectTemplate($event, $template_key)
 	{
 		if ( $this->Application->isAdmin || $event->status != kEvent::erSUCCESS ) {
 			return;
 		}
 
 		// prepare redirect template
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		$is_active = ($object->GetDBField('Status') == STATUS_ACTIVE);
 
 		$next_template = $is_active ? 'confirm_template' : 'pending_confirm_template';
 		$event->redirect = $this->Application->GetVar($template_key . '_' . $next_template);
 		$event->SetRedirectParam('opener', 's');
 
 		// send email events
 		$perm_prefix = $event->getUnitConfig()->getPermItemPrefix();
 		$owner_field = $this->getOwnerField($event->Prefix);
 		$owner_id = $object->GetDBField($owner_field);
 		$send_params = $object->getEmailParams();
 
 		switch ( $event->Name ) {
 			case 'OnCreate':
 				$event_suffix = $is_active ? 'ADD' : 'ADD.PENDING';
 				$this->Application->emailUser($perm_prefix . '.' . $event_suffix, $owner_id, $send_params);
 				$this->Application->emailAdmin($perm_prefix . '.' . $event_suffix, null, $send_params); // there are no ADD.PENDING event for admin :(
 				break;
 
 			case 'OnUpdate':
 				$event_suffix = $is_active ? 'MODIFY' : 'MODIFY.PENDING';
 				$user_id = is_numeric($object->GetDBField('ModifiedById')) ? $object->GetDBField('ModifiedById') : $owner_id;
 				$this->Application->emailUser($perm_prefix . '.' . $event_suffix, $user_id, $send_params);
 				$this->Application->emailAdmin($perm_prefix . '.' . $event_suffix, null, $send_params); // there are no ADD.PENDING event for admin :(
 				break;
 		}
 	}
 
 	/**
 	 * Apply same processing to each item being selected in grid
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function iterateItems(kEvent $event)
 	{
 		if ( $event->Name != 'OnMassApprove' && $event->Name != 'OnMassDecline' ) {
 			parent::iterateItems($event);
 		}
 
 		if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
 			$event->status = kEvent::erFAIL;
 			return ;
 		}
 
+		/** @var kCatDBItem $object */
 		$object = $event->getObject(Array ('skip_autoload' => true));
-		/* @var $object kCatDBItem */
 
 		$ids = $this->StoreSelectedIDs($event);
 
 		if ( $ids ) {
 			foreach ($ids as $id) {
 				$object->Load($id);
 
 				switch ( $event->Name ) {
 					case 'OnMassApprove':
 						$object->ApproveChanges();
 						break;
 
 					case 'OnMassDecline':
 						$object->DeclineChanges();
 						break;
 				}
 			}
 		}
 
 		$this->clearSelectedIDs($event);
 	}
 
 	/**
 	 * Deletes items & preserves clean env
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnDelete(kEvent $event)
 	{
 		parent::OnDelete($event);
 
 		if ( $event->status == kEvent::erSUCCESS && !$this->Application->isAdmin ) {
 			$event->SetRedirectParam('pass', 'm');
 			$event->SetRedirectParam('m_cat_id', 0);
 		}
 	}
 
 	/**
 	 * Checks, that currently loaded item is allowed for viewing (non permission-based)
 	 *
 	 * @param kEvent $event
 	 * @return bool
 	 * @access protected
 	 */
 	protected function checkItemStatus(kEvent $event)
 	{
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		if ( !$object->isLoaded() ) {
 			if ( $event->Special != 'previous' && $event->Special != 'next' ) {
 				$this->_errorNotFound($event);
 			}
 
 			return true;
 		}
 
 		$status = $object->GetDBField('Status');
 		$user_id = $this->Application->RecallVar('user_id');
 		$owner_field = $this->getOwnerField($event->Prefix);
 
 		if ( ($status == STATUS_PENDING_EDITING || $status == STATUS_PENDING) && ($object->GetDBField($owner_field) == $user_id) ) {
 			return true;
 		}
 
 		return $status == STATUS_ACTIVE;
 	}
 
 	/**
 	 * Set's correct sorting for list based on data provided with event
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 * @see kDBEventHandler::OnListBuild()
 	 */
 	protected function SetSorting(kEvent $event)
 	{
 		if ( !$this->Application->isAdmin ) {
 			$event->setEventParam('same_special', true);
 		}
 
 		$types = $event->getEventParam('types');
 		$types = $types ? explode(',', $types) : Array ();
 
 		if ( in_array('search', $types) ) {
 			$event->setPseudoClass('_List');
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			// 1. no user sorting - sort by relevance
 			$default_sortings = parent::_getDefaultSorting($event);
 			$default_sorting = key($default_sortings['Sorting']) . ',' . current($default_sortings['Sorting']);
 
 			if ( $object->isMainList() ) {
 				$sort_by = $this->Application->GetVar('sort_by', '');
 
 				if ( !$sort_by ) {
 					$this->Application->SetVar('sort_by', 'Relevance,desc|' . $default_sorting);
 				}
 			}
 			else {
 				$sorting_settings = $this->getListSetting($event, 'Sortings');
 				$sort_by = trim(getArrayValue($sorting_settings, 'Sort1') . ',' . getArrayValue($sorting_settings, 'Sort1_Dir'), ',');
 
 				if ( !$sort_by ) {
 					$event->setEventParam('sort_by', 'Relevance,desc|' . $default_sorting);
 				}
 			}
 
 			$this->_removeForcedSortings($event);
 		}
 
 		parent::SetSorting($event);
 	}
 
 	/**
 	 * Removes forced sortings
 	 *
 	 * @param kEvent $event
 	 */
 	protected function _removeForcedSortings(kEvent $event)
 	{
 		$config = $event->getUnitConfig();
 
 		foreach ($config->getListSortingSpecials() as $special) {
 			$list_sortings = $config->getListSortingsBySpecial($special);
 			unset($list_sortings['ForcedSorting']);
 			$config->setListSortingsBySpecial('', $list_sortings);
 		}
 	}
 
 	/**
 	 * Default sorting in search results only comes from relevance field
 	 *
 	 * @param kEvent $event
 	 * @return Array
 	 * @access protected
 	 */
 	protected function _getDefaultSorting(kEvent $event)
 	{
 		$types = $event->getEventParam('types');
 		$types = $types ? explode(',', $types) : Array ();
 
 		return in_array('search', $types) ? Array () : parent::_getDefaultSorting($event);
 	}
 
 	/**
 	 * Returns current per-page setting for list
 	 *
 	 * @param kEvent $event
 	 * @return int
 	 * @access protected
 	 */
 	protected function getPerPage(kEvent $event)
 	{
 		if ( !$this->Application->isAdmin ) {
 			$event->setEventParam('same_special', true);
 		}
 
 		return parent::getPerPage($event);
 	}
 
 	/**
 	 * Returns owner field for given prefix
 	 *
 	 * @param $prefix
 	 * @return string
 	 * @access protected
 	 */
 	protected function getOwnerField($prefix)
 	{
 		return $this->Application->getUnitConfig($prefix)->getOwnerField('CreatedById');
 	}
 
 	/**
 	 * Creates virtual image fields for item
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnAfterConfigRead(kEvent $event)
 	{
 		parent::OnAfterConfigRead($event);
 
 		if (defined('IS_INSTALL') && IS_INSTALL) {
 			$this->addViewPermissionJoin($event);
 
 			return ;
 		}
 
 		if ( !$this->Application->isAdmin ) {
+			/** @var FileHelper $file_helper */
 			$file_helper = $this->Application->recallObject('FileHelper');
-			/* @var $file_helper FileHelper */
 
 			$file_helper->createItemFiles($event->Prefix, true); // create image fields
 			$file_helper->createItemFiles($event->Prefix, false); // create file fields
 		}
 
 		$this->changeSortings($event)->addViewPermissionJoin($event);
 
 		// add grids for advanced view (with primary category column)
 		$config = $event->getUnitConfig();
 
 		foreach (Array ('Default', 'Radio') as $process_grid) {
 			$grid_data = $config->getGridByName($process_grid);
 			$grid_data['Fields']['CachedNavbar'] = Array ('title' => 'la_col_Path', 'data_block' => 'grid_primary_category_td', 'filter_block' => 'grid_like_filter');
 			$config->addGrids($grid_data, $process_grid . 'ShowAll');
 		}
 
 		// add options for CategoryId field (quick way to select item's primary category)
+		/** @var CategoryHelper $category_helper */
 		$category_helper = $this->Application->recallObject('CategoryHelper');
-		/* @var $category_helper CategoryHelper */
 
 		$virtual_fields = $config->getVirtualFields();
 		$virtual_fields['CategoryId']['default'] = (int)$this->Application->GetVar('m_cat_id');
 		$virtual_fields['CategoryId']['options'] = $category_helper->getStructureTreeAsOptions();
 		$config->setVirtualFields($virtual_fields);
 	}
 
 	/**
 	 * Changes default sorting according to system settings.
 	 *
 	 * @param kEvent $event Event.
 	 *
 	 * @return self
 	 * @access protected
 	 */
 	protected function changeSortings(kEvent $event)
 	{
 		$remove_sortings = Array ();
 		$config = $event->getUnitConfig();
 
 		if ( !$this->Application->isAdmin ) {
 			// remove Pick sorting on Front-end, when not required
 			$config_mapping = $config->getConfigMapping(Array ());
 
 			if ( !isset($config_mapping['ForceEditorPick']) || !$this->Application->ConfigValue($config_mapping['ForceEditorPick']) ) {
 				$remove_sortings[] = 'EditorsPick';
 			}
 		}
 		else {
 			// remove all forced sortings in Admin Console
 			$remove_sortings = array_merge($remove_sortings, Array ('Priority', 'EditorsPick'));
 		}
 
 		if ( !$remove_sortings ) {
 			return $this;
 		}
 
 		foreach ($config->getListSortingSpecials() as $special) {
 			$list_sortings = $config->getListSortingsBySpecial($special);
 
 			foreach ($remove_sortings as $sorting_field) {
 				unset($list_sortings['ForcedSorting'][$sorting_field]);
 			}
 
 			$config->setListSortingsBySpecial('', $list_sortings);
 		}
 
 		return $this;
 	}
 
 	/**
 	 * Adds permission table table JOIN clause only, when advanced catalog view permissions enabled.
 	 *
 	 * @param kEvent $event Event.
 	 *
 	 * @return self
 	 * @access protected
 	 */
 	protected function addViewPermissionJoin(kEvent $event)
 	{
 		if ( $this->Application->ConfigValue('CheckViewPermissionsInCatalog') ) {
 			$join_clause = 'LEFT JOIN ' . TABLE_PREFIX . 'CategoryPermissionsCache perm ON perm.CategoryId = ' . TABLE_PREFIX . '%3$sCategoryItems.CategoryId';
 		}
 		else {
 			$join_clause = '';
 		}
 
 		$config = $event->getUnitConfig();
 
 		foreach ( $config->getListSQLSpecials() as $special ) {
 			$list_sql = str_replace('{PERM_JOIN}', $join_clause, $config->getListSQLsBySpecial($special));
 			$config->setListSQLsBySpecial($special, $list_sql);
 		}
 
 		return $this;
 	}
 
 	/**
 	 * Returns file contents associated with item
 	 *
 	 * @param kEvent $event
 	 */
 	function OnDownloadFile($event)
 	{
+		/** @var kCatDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kCatDBItem */
 
 		$event->status = kEvent::erSTOP;
 
 		$field = $this->Application->GetVar('field');
 		if (!preg_match('/^File([\d]+)/', $field)) {
 			return ;
 		}
 
+		/** @var FileHelper $file_helper */
 		$file_helper = $this->Application->recallObject('FileHelper');
-		/* @var $file_helper FileHelper */
 
 		$filename = $object->GetField($field, 'full_path');
 		$file_helper->DownloadFile($filename);
 	}
 
 	/**
 	 * Saves user's vote
 	 *
 	 * @param kEvent $event
 	 */
 	function OnMakeVote($event)
 	{
 		$event->status = kEvent::erSTOP;
 
 		if ($this->Application->GetVar('ajax') != 'yes') {
 			// this is supposed to call from AJAX only
 			return ;
 		}
 
+		/** @var RatingHelper $rating_helper */
 		$rating_helper = $this->Application->recallObject('RatingHelper');
-		/* @var $rating_helper RatingHelper */
 
+		/** @var kCatDBItem $object */
 		$object = $event->getObject( Array ('skip_autoload' => true) );
-		/* @var $object kCatDBItem */
 
 		$object->Load( $this->Application->GetVar('id') );
 
 		echo $rating_helper->makeVote($object);
 	}
 
 	/**
 	 * Marks review as useful
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnReviewHelpful($event)
 	{
 		if ( $this->Application->GetVar('ajax') == 'yes' ) {
 			$event->status = kEvent::erSTOP;
 		}
 
 		$review_id = (int)$this->Application->GetVar('review_id');
 
 		if ( !$review_id ) {
 			return;
 		}
 
+		/** @var SpamHelper $spam_helper */
 		$spam_helper = $this->Application->recallObject('SpamHelper');
-		/* @var $spam_helper SpamHelper */
 
 		$spam_helper->InitHelper($review_id, 'ReviewHelpful', strtotime('+1 month') - strtotime('now'));
 		$field = (int)$this->Application->GetVar('helpful') ? 'HelpfulCount' : 'NotHelpfulCount';
 
 		$review_config = $this->Application->getUnitConfig('rev');
 
 		$sql = 'SELECT ' . $field . '
 				FROM ' . $review_config->getTableName() . '
 				WHERE ' . $review_config->getIDField() . ' = ' . $review_id;
 		$count = $this->Conn->GetOne($sql);
 
 		if ( $spam_helper->InSpamControl() ) {
 			if ( $this->Application->GetVar('ajax') == 'yes' ) {
 				echo $count;
 			}
 
 			return;
 		}
 
 		$sql = 'UPDATE ' . $review_config->getTableName() . '
 				SET ' . $field . ' = ' . $field . ' + 1
 				WHERE ' . $review_config->getIDField() . ' = ' . $review_id;
 		$this->Conn->Query($sql);
 
 		if ( $this->Conn->getAffectedRows() ) {
 			// db was changed -> review with such ID exists
 			$spam_helper->AddToSpamControl();
 		}
 
 		if ( $this->Application->GetVar('ajax') == 'yes' ) {
 			echo $count + 1;
 		}
 	}
 
 	/**
 	 * [HOOK] Allows to add cloned subitem to given prefix
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnCloneSubItem(kEvent $event)
 	{
 		parent::OnCloneSubItem($event);
 
 		if ( $event->MasterEvent->Prefix == 'fav' ) {
 			$master_config = $event->MasterEvent->getUnitConfig();
 
 			$clones = $master_config->getClones();
 			$sub_item_prefix = $event->Prefix . '-' . $event->MasterEvent->Prefix;
 
 			$clones[$sub_item_prefix]['ParentTableKey'] = 'ResourceId';
 			$clones[$sub_item_prefix]['ForeignKey'] = 'ResourceId';
 
 			$master_config->setClones($clones);
 		}
 	}
 
 	/**
 	 * Set's new unique resource id to user
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnAfterItemValidate(kEvent $event)
 	{
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		$resource_id = $object->GetDBField('ResourceId');
 
 		if ( !$resource_id ) {
 			$object->SetDBField('ResourceId', $this->Application->NextResourceId());
 		}
 	}
 }
Index: branches/5.3.x/core/kernel/application.php
===================================================================
--- branches/5.3.x/core/kernel/application.php	(revision 16518)
+++ branches/5.3.x/core/kernel/application.php	(revision 16519)
@@ -1,3092 +1,3092 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 use InPortal\Core\kernel\Console\ConsoleApplication;
 
 defined('FULL_PATH') or die('restricted access!');
 
 /**
 * Basic class for Kernel4-based Application
 *
 * This class is a Facade for any other class which needs to deal with Kernel4 framework.<br>
 * The class encapsulates the main run-cycle of the script, provide access to all other objects in the framework.<br>
 * <br>
 * The class is a singleton, which means that there could be only one instance of kApplication in the script.<br>
 * This could be guaranteed by NOT calling the class constructor directly, but rather calling kApplication::Instance() method,
 * which returns an instance of the application. The method guarantees that it will return exactly the same instance for any call.<br>
 * See singleton pattern by GOF.
 */
 class kApplication implements kiCacheable {
 
 	/**
 	 * Location of module helper class (used in installator too)
 	 */
 	const MODULE_HELPER_PATH = '/../units/helpers/modules_helper.php';
 
 	/**
 	 * Is true, when Init method was called already, prevents double initialization
 	 *
 	 * @var bool
 	 */
 	public $InitDone = false;
 
 	/**
 	 * Holds internal NParser object
 	 *
 	 * @var NParser
 	 * @access public
 	 */
 	public $Parser;
 
 	/**
 	 * Holds parser output buffer
 	 *
 	 * @var string
 	 * @access protected
 	 */
 	protected $HTML = '';
 
 	/**
 	 * The main Factory used to create
 	 * almost any class of kernel and
 	 * modules
 	 *
 	 * @var kFactory
 	 * @access protected
 	 */
 	protected $Factory;
 
 	/**
 	 * Template names, that will be used instead of regular templates
 	 *
 	 * @var Array
 	 * @access public
 	 */
 	public $ReplacementTemplates = Array ();
 
 	/**
 	 * Registered routers, that are used during url building and parsing.
 	 *
 	 * @var array
 	 */
 	public $routers = array();
 
 	/**
 	 * Reference to debugger
 	 *
 	 * @var Debugger
 	 * @access public
 	 */
 	public $Debugger = null;
 
 	/**
 	 * Holds all phrases used
 	 * in code and template
 	 *
 	 * @var kPhraseCache
 	 * @access public
 	 */
 	public $Phrases;
 
 	/**
 	 * Modules table content, key - module name
 	 *
 	 * @var Array
 	 * @access public
 	 */
 	public $ModuleInfo = Array ();
 
 	/**
 	 * Holds DBConnection
 	 *
 	 * @var IDBConnection
 	 * @access public
 	 */
 	public $Conn = null;
 
 	/**
 	 * Reference to event log
 	 *
 	 * @var Array|kLogger
 	 * @access public
 	 */
 	protected $_logger = Array ();
 
 	// performance needs:
 	/**
 	 * Holds a reference to httpquery
 	 *
 	 * @var kHttpQuery
 	 * @access public
 	 */
 	public $HttpQuery = null;
 
 	/**
 	 * Holds a reference to UnitConfigReader
 	 *
 	 * @var kUnitConfigReader
 	 * @access public
 	 */
 	public $UnitConfigReader = null;
 
 	/**
 	 * Holds a reference to Session
 	 *
 	 * @var Session
 	 * @access public
 	 */
 	public $Session = null;
 
 	/**
 	 * Holds a ref to kEventManager
 	 *
 	 * @var kEventManager
 	 * @access public
 	 */
 	public $EventManager = null;
 
 	/**
 	 * Holds a ref to kUrlManager
 	 *
 	 * @var kUrlManager
 	 * @access public
 	 */
 	public $UrlManager = null;
 
 	/**
 	 * Ref for TemplatesCache
 	 *
 	 * @var TemplatesCache
 	 * @access public
 	 */
 	public $TemplatesCache = null;
 
 	/**
 	 * Holds current NParser tag while parsing, can be used in error messages to display template file and line
 	 *
 	 * @var _BlockTag
 	 * @access public
 	 */
 	public $CurrentNTag = null;
 
 	/**
 	 * Object of unit caching class
 	 *
 	 * @var kCacheManager
 	 * @access public
 	 */
 	public $cacheManager = null;
 
 	/**
 	 * Tells, that administrator has authenticated in administrative console
 	 * Should be used to manipulate data change OR data restrictions!
 	 *
 	 * @var bool
 	 * @access public
 	 */
 	public $isAdminUser = false;
 
 	/**
 	 * Tells, that admin version of "index.php" was used, nothing more!
 	 * Should be used to manipulate data display!
 	 *
 	 * @var bool
 	 * @access public
 	 */
 	public $isAdmin = false;
 
 	/**
 	 * Instance of site domain object
 	 *
 	 * @var kDBItem
 	 * @access public
 	 * @todo move away into separate module
 	 */
 	public $siteDomain = null;
 
 	/**
 	 * Prevent kApplication class to be created directly, only via Instance method
 	 *
 	 * @access private
 	 */
 	private function __construct()
 	{
 
 	}
 
 	final private function __clone() {}
 
 	/**
 	 * Returns kApplication instance anywhere in the script.
 	 *
 	 * This method should be used to get single kApplication object instance anywhere in the
 	 * Kernel-based application. The method is guaranteed to return the SAME instance of kApplication.
 	 * Anywhere in the script you could write:
 	 * <code>
 	 *		$application =& kApplication::Instance();
 	 * </code>
 	 * or in an object:
 	 * <code>
 	 *		$this->Application =& kApplication::Instance();
 	 * </code>
 	 * to get the instance of kApplication. Note that we call the Instance method as STATIC - directly from the class.
 	 * To use descendant of standard kApplication class in your project you would need to define APPLICATION_CLASS constant
 	 * BEFORE calling kApplication::Instance() for the first time. If APPLICATION_CLASS is not defined the method would
 	 * create and return default KernelApplication instance.
 	 *
 	 * Pattern: Singleton
 	 *
 	 * @static
 	 * @return kApplication
 	 * @access public
 	 */
 	public static function &Instance()
 	{
 		static $instance = false;
 
 		if ( !$instance ) {
 			$class = defined('APPLICATION_CLASS') ? APPLICATION_CLASS : 'kApplication';
 			$instance = new $class();
 		}
 
 		return $instance;
 	}
 
 	/**
 	 * Initializes the Application
 	 *
 	 * @param string $factory_class
 	 * @return bool Was Init actually made now or before
 	 * @access public
 	 * @see kHTTPQuery
 	 * @see Session
 	 * @see TemplatesCache
 	 */
 	public function Init($factory_class = 'kFactory')
 	{
 		if ( $this->InitDone ) {
 			return false;
 		}
 
 		if ( preg_match('/utf-8/i', CHARSET) ) {
 			setlocale(LC_ALL, 'en_US.UTF-8');
 			mb_internal_encoding('UTF-8');
 		}
 
 		$this->isAdmin = kUtil::constOn('ADMIN');
 
 		if ( !kUtil::constOn('SKIP_OUT_COMPRESSION') ) {
 			ob_start(); // collect any output from method (other then tags) into buffer
 		}
 
 		if ( defined('DEBUG_MODE') && $this->isDebugMode() && kUtil::constOn('DBG_PROFILE_MEMORY') ) {
 			$this->Debugger->appendMemoryUsage('Application before Init:');
 		}
 
 		$this->_logger = new kLogger($this->_logger);
 		$this->Factory = new $factory_class();
 		$this->registerDefaultClasses();
 
 		$system_config = new kSystemConfig(true);
 		$vars = $system_config->getData();
 		$db_class = isset($vars['Databases']) ? 'kDBLoadBalancer' : ($this->isDebugMode() ? 'kDBConnectionDebug' : 'kDBConnection');
 		$this->Conn = $this->Factory->makeClass($db_class, Array (SQL_TYPE, Array ($this->_logger, 'handleSQLError')));
 		$this->Conn->setup($vars);
 
 		$this->cacheManager = $this->makeClass('kCacheManager');
 		$this->cacheManager->InitCache();
 
 		if ( defined('DEBUG_MODE') && $this->isDebugMode() ) {
 			$this->Debugger->appendTimestamp('Before UnitConfigReader');
 		}
 
 		// init config reader and all managers
 		$this->UnitConfigReader = $this->makeClass('kUnitConfigReader');
 		$this->UnitConfigReader->scanModules(MODULES_PATH); // Will also set routers.
 
 		$this->registerModuleConstants();
 
 		if ( defined('DEBUG_MODE') && $this->isDebugMode() ) {
 			$this->Debugger->appendTimestamp('After UnitConfigReader');
 		}
 
 		define('MOD_REWRITE', $this->ConfigValue('UseModRewrite') && !$this->isAdmin ? 1 : 0);
 
 		// start processing request
 		$this->HttpQuery = $this->recallObject('kHTTPQuery');
 		$this->HttpQuery->process();
 
 		if ( defined('DEBUG_MODE') && $this->isDebugMode() ) {
 			$this->Debugger->appendTimestamp('Processed HTTPQuery initial');
 		}
 
 		$this->Session = $this->recallObject('Session');
 
 		if ( defined('DEBUG_MODE') && $this->isDebugMode() ) {
 			$this->Debugger->appendTimestamp('Processed Session');
 		}
 
 		$this->Session->ValidateExpired(); // needs mod_rewrite url already parsed to keep user at proper template after session expiration
 
 		if ( defined('DEBUG_MODE') && $this->isDebugMode() ) {
 			$this->Debugger->appendTimestamp('Processed HTTPQuery AfterInit');
 		}
 
 		$this->cacheManager->LoadApplicationCache();
 
 		$site_timezone = $this->ConfigValue('Config_Site_Time');
 
 		if ( $site_timezone ) {
 			date_default_timezone_set($site_timezone);
 		}
 
 		if ( defined('DEBUG_MODE') && $this->isDebugMode() ) {
 			$this->Debugger->appendTimestamp('Loaded cache and phrases');
 		}
 
 		$this->ValidateLogin(); // must be called before AfterConfigRead, because current user should be available there
 
 		$this->UnitConfigReader->AfterConfigRead();
 
 		if ( defined('DEBUG_MODE') && $this->isDebugMode() ) {
 			$this->Debugger->appendTimestamp('Processed AfterConfigRead');
 		}
 
 		if ( $this->GetVar('m_cat_id') === false ) {
 			$this->SetVar('m_cat_id', 0);
 		}
 
 		if ( !$this->RecallVar('curr_iso') && !(defined('IS_INSTALL') && IS_INSTALL) ) {
 			$this->StoreVar('curr_iso', $this->GetPrimaryCurrency(), true); // true for optional
 		}
 
 		$visit_id = $this->RecallVar('visit_id');
 
 		if ( $visit_id !== false ) {
 			$this->SetVar('visits_id', $visit_id);
 		}
 
 		if ( defined('DEBUG_MODE') && $this->isDebugMode() ) {
 			$this->Debugger->profileFinish('kernel4_startup');
 		}
 
 		$this->InitDone = true;
 
 		if ( PHP_SAPI !== 'cli' && !$this->isAdmin ) {
 			$this->HandleEvent(new kEvent('adm:OnStartup'));
 		}
 
 		return true;
 	}
 
 	/**
 	 * Performs initialization of manager classes, that can be overridden from unit configs
 	 *
 	 * @return void
 	 * @access public
 	 * @throws Exception
 	 */
 	public function InitManagers()
 	{
 		if ( $this->InitDone ) {
 			throw new Exception('Duplicate call of ' . __METHOD__, E_USER_ERROR);
 		}
 
 		$this->UrlManager = $this->makeClass('kUrlManager');
 		$this->EventManager = $this->makeClass('kEventManager');
 		$this->Phrases = $this->makeClass('kPhraseCache');
 
 		$this->RegisterDefaultBuildEvents();
 	}
 
 	/**
 	 * Returns module information. Searches module by requested field
 	 *
 	 * @param string $field
 	 * @param mixed $value
 	 * @param string $return_field field value to returns, if not specified, then return all fields
 	 * @return Array
 	 */
 	public function findModule($field, $value, $return_field = null)
 	{
 		$found = $module_info = false;
 
 		foreach ($this->ModuleInfo as $module_info) {
 			if ( strtolower($module_info[$field]) == strtolower($value) ) {
 				$found = true;
 				break;
 			}
 		}
 
 		if ( $found ) {
 			return isset($return_field) ? $module_info[$return_field] : $module_info;
 		}
 
 		return false;
 	}
 
 	/**
 	 * Refreshes information about loaded modules
 	 *
 	 * @return void
 	 * @access public
 	 */
 	public function refreshModuleInfo()
 	{
 		if ( defined('IS_INSTALL') && IS_INSTALL && !$this->TableFound('Modules', true) ) {
 			$this->registerModuleConstants();
 			$this->Factory->configureAutoloader();
 
 			return;
 		}
 
 		// use makeClass over recallObject, since used before kApplication initialization during installation
+		/** @var kModulesHelper $modules_helper */
 		$modules_helper = $this->makeClass('kModulesHelper');
-		/* @var $modules_helper kModulesHelper */
 
 		$this->Conn->nextQueryCachable = true;
 		$sql = 'SELECT *
 				FROM ' . TABLE_PREFIX . 'Modules
 				WHERE ' . $modules_helper->getWhereClause() . '
 				ORDER BY LoadOrder';
 		$this->ModuleInfo = $this->Conn->Query($sql, 'Name');
 
 		$this->registerModuleConstants();
 		$this->Factory->configureAutoloader();
 	}
 
 	/**
 	 * Checks if passed language id if valid and sets it to primary otherwise
 	 *
 	 * @return void
 	 * @access public
 	 */
 	public function VerifyLanguageId()
 	{
 		/** @var LanguagesItem $lang */
 		$lang = $this->recallObject('lang.current');
 
 		if ( !$lang->isLoaded() || (!$this->isAdmin && !$lang->GetDBField('Enabled')) ) {
 			if ( !defined('IS_INSTALL') ) {
 				$this->ApplicationDie('Unknown or disabled language');
 			}
 		}
 	}
 
 	/**
 	 * Checks if passed theme id if valid and sets it to primary otherwise
 	 *
 	 * @return void
 	 * @access public
 	 */
 	public function VerifyThemeId()
 	{
 		if ( $this->isAdmin ) {
 			kUtil::safeDefine('THEMES_PATH', '/core/admin_templates');
 
 			return;
 		}
 
 		$path = $this->GetFrontThemePath();
 
 		if ( $path === false ) {
 			$this->ApplicationDie('No Primary Theme Selected or Current Theme is Unknown or Disabled');
 		}
 
 		kUtil::safeDefine('THEMES_PATH', $path);
 	}
 
 	/**
 	 * Returns relative path to current front-end theme
 	 *
 	 * @param bool $force
 	 * @return string
 	 * @access public
 	 */
 	public function GetFrontThemePath($force = false)
 	{
 		static $path = null;
 
 		if ( !$force && isset($path) ) {
 			return $path;
 		}
 
 		/** @var ThemeItem $theme */
 		$theme = $this->recallObject('theme.current');
 
 		if ( !$theme->isLoaded() || !$theme->GetDBField('Enabled') ) {
 			return false;
 		}
 
 		// assign & then return, since it's static variable
 		$path = '/themes/' . $theme->GetDBField('Name');
 
 		return $path;
 	}
 
 	/**
 	 * Returns primary front/admin language id
 	 *
 	 * @param bool $init
 	 * @return int
 	 * @access public
 	 */
 	public function GetDefaultLanguageId($init = false)
 	{
 		$cache_key = 'primary_language_info[%LangSerial%]';
 		$language_info = $this->getCache($cache_key);
 
 		if ( $language_info === false ) {
 			// cache primary language info first
 			$language_config = $this->getUnitConfig('lang');
 
 			$table = $language_config->getTableName();
 			$id_field = $language_config->getIDField();
 
 			$this->Conn->nextQueryCachable = true;
 			$sql = 'SELECT ' . $id_field . ', IF(AdminInterfaceLang, "Admin", "Front") AS LanguageKey
 					FROM ' . $table . '
 					WHERE (AdminInterfaceLang = 1 OR PrimaryLang = 1) AND (Enabled = 1)';
 			$language_info = $this->Conn->GetCol($sql, 'LanguageKey');
 
 			if ( $language_info !== false ) {
 				$this->setCache($cache_key, $language_info);
 			}
 		}
 
 		$language_key = ($this->isAdmin && $init) || count($language_info) == 1 ? 'Admin' : 'Front';
 
 		if ( array_key_exists($language_key, $language_info) && $language_info[$language_key] > 0 ) {
 			// get from cache
 			return $language_info[$language_key];
 		}
 
 		$language_id = $language_info && array_key_exists($language_key, $language_info) ? $language_info[$language_key] : false;
 
 		if ( !$language_id && defined('IS_INSTALL') && IS_INSTALL ) {
 			$language_id = 1;
 		}
 
 		return $language_id;
 	}
 
 	/**
 	 * Returns front-end primary theme id (even, when called from admin console)
 	 *
 	 * @param bool $force_front
 	 * @return int
 	 * @access public
 	 */
 	public function GetDefaultThemeId($force_front = false)
 	{
 		static $theme_id = 0;
 
 		if ( $theme_id > 0 ) {
 			return $theme_id;
 		}
 
 		if ( kUtil::constOn('DBG_FORCE_THEME') ) {
 			$theme_id = DBG_FORCE_THEME;
 		}
 		elseif ( !$force_front && $this->isAdmin ) {
 			$theme_id = 999;
 		}
 		else {
 			$cache_key = 'primary_theme[%ThemeSerial%]';
 			$theme_id = $this->getCache($cache_key);
 
 			if ( $theme_id === false ) {
 				$this->Conn->nextQueryCachable = true;
 				$theme_config = $this->getUnitConfig('theme');
 
 				$sql = 'SELECT ' . $theme_config->getIDField() . '
 						FROM ' . $theme_config->getTableName() . '
 						WHERE (PrimaryTheme = 1) AND (Enabled = 1)';
 				$theme_id = $this->Conn->GetOne($sql);
 
 				if ( $theme_id !== false ) {
 					$this->setCache($cache_key, $theme_id);
 				}
 			}
 		}
 
 		return $theme_id;
 	}
 
 	/**
 	 * Returns site primary currency ISO code
 	 *
 	 * @return string
 	 * @access public
 	 * @todo Move into In-Commerce
 	 */
 	public function GetPrimaryCurrency()
 	{
 		$cache_key = 'primary_currency[%CurrSerial%][%SiteDomainSerial%]:' . $this->siteDomainField('DomainId');
 		$currency_iso = $this->getCache($cache_key);
 
 		if ( $currency_iso === false ) {
 			if ( $this->prefixRegistred('curr') ) {
 				$this->Conn->nextQueryCachable = true;
 				$currency_id = $this->siteDomainField('PrimaryCurrencyId');
 
 				$sql = 'SELECT ISO
 						FROM ' . $this->getUnitConfig('curr')->getTableName() . '
 						WHERE ' . ($currency_id > 0 ? 'CurrencyId = ' . $currency_id : 'IsPrimary = 1');
 				$currency_iso = $this->Conn->GetOne($sql);
 			}
 			else {
 				$currency_iso = 'USD';
 			}
 
 			$this->setCache($cache_key, $currency_iso);
 		}
 
 		return $currency_iso;
 	}
 
 	/**
 	 * Returns site domain field. When none of site domains are found false is returned.
 	 *
 	 * @param string $field
 	 * @param bool $formatted
 	 * @param string $format
 	 * @return mixed
 	 * @todo Move into separate module
 	 */
 	public function siteDomainField($field, $formatted = false, $format = null)
 	{
 		if ( $this->isAdmin ) {
 			// don't apply any filtering in administrative console
 			return false;
 		}
 
 		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() ) {
 			return $formatted ? $this->siteDomain->GetField($field, $format) : $this->siteDomain->GetDBField($field);
 		}
 
 		return false;
 	}
 
 	/**
 	 * Registers classes, that are used before unit configs (where class registration usually is done) are read.
 	 *
 	 * Called automatically while initializing kApplication.
 	 *
 	 * @return void
 	 * @access public
 	 */
 	public function RegisterDefaultClasses()
 	{
 		// Database.
 		$this->registerClass('IDBConnection', KERNEL_PATH . '/db/i_db_connection.php');
 		$this->registerClass('kDBConnection', KERNEL_PATH . '/db/db_connection.php');
 		$this->registerClass('kDBConnectionDebug', KERNEL_PATH . '/db/db_connection.php');
 		$this->registerClass('kDBLoadBalancer', KERNEL_PATH . '/db/db_load_balancer.php');
 
 		// Cache.
 		$this->registerClass('kCacheManager', KERNEL_PATH . '/managers/cache_manager.php');
 		$this->registerClass('kCache', KERNEL_PATH . '/utility/cache.php');
 		$this->registerClass('kSubscriptionItem', KERNEL_PATH . '/managers/subscription_manager.php');
 
 		// Unit configs.
 		$this->registerClass('kUnitConfigReader', KERNEL_PATH . '/utility/unit_config_reader.php');
 		$this->registerClass('kUnitConfigCloner', KERNEL_PATH . '/utility/unit_config_cloner.php');
 
 		// Urls.
 		$this->registerClass('kUrlManager', KERNEL_PATH . '/managers/url_manager.php');
 		$this->registerClass('kUrlProcessor', KERNEL_PATH . '/managers/url_processor.php');
 		$this->registerClass('kPlainUrlProcessor', KERNEL_PATH . '/managers/plain_url_processor.php');
 		// $this->registerClass('kRewriteUrlProcessor', KERNEL_PATH . '/managers/rewrite_url_processor.php');
 
 		// Events.
 		$this->registerClass('kEventManager', KERNEL_PATH . '/event_manager.php');
 		$this->registerClass('kHookManager', KERNEL_PATH . '/managers/hook_manager.php');
 		$this->registerClass('kScheduledTaskManager', KERNEL_PATH . '/managers/scheduled_task_manager.php');
 		$this->registerClass('kRequestManager', KERNEL_PATH . '/managers/request_manager.php');
 
 		// Misc.
 		$this->registerClass('kPhraseCache', KERNEL_PATH . '/languages/phrases_cache.php');
 		$this->registerClass('kModulesHelper', KERNEL_PATH . self::MODULE_HELPER_PATH);
 
 		// Aliased.
 		$this->registerClass('Params', KERNEL_PATH . '/utility/params.php', 'kActions');
 		$this->registerClass('kMainTagProcessor', KERNEL_PATH . '/processors/main_processor.php', 'm_TagProcessor');
 		$this->registerClass('kEmailSendingHelper', KERNEL_PATH . '/utility/email_send.php', 'EmailSender');
 	}
 
 	/**
 	 * Registers default build events
 	 *
 	 * @return void
 	 */
 	public function RegisterDefaultBuildEvents()
 	{
 		$this->EventManager->registerBuildEvent('kTempTablesHandler', 'OnTempHandlerBuild');
 	}
 
 	/**
 	 * Returns cached category information by given cache name. All given category
 	 * information is recached, when at least one of 4 caches is missing.
 	 *
 	 * @param int $category_id
 	 * @param string $name cache name = {filenames, category_designs, category_tree}
 	 * @return string
 	 * @access public
 	 */
 	public function getCategoryCache($category_id, $name)
 	{
 		return $this->cacheManager->getCategoryCache($category_id, $name);
 	}
 
 	/**
 	 * Returns caching type (none, memory, temporary)
 	 *
 	 * @param int $caching_type
 	 * @return bool
 	 * @access public
 	 */
 	public function isCachingType($caching_type)
 	{
 		return $this->cacheManager->isCachingType($caching_type);
 	}
 
 	/**
 	 * Increments serial based on prefix and it's ID (optional)
 	 *
 	 * @param string $prefix
 	 * @param int $id ID (value of IDField) or ForeignKeyField:ID
 	 * @param bool $increment
 	 * @return string
 	 * @access public
 	 */
 	public function incrementCacheSerial($prefix, $id = null, $increment = true)
 	{
 		return $this->cacheManager->incrementCacheSerial($prefix, $id, $increment);
 	}
 
 	/**
 	 * Returns cached $key value from cache named $cache_name
 	 *
 	 * @param int $key key name from cache
 	 * @param bool $store_locally store data locally after retrieved
 	 * @param int $max_rebuild_seconds
 	 * @return mixed
 	 * @access public
 	 */
 	public function getCache($key, $store_locally = true, $max_rebuild_seconds = 0)
 	{
 		return $this->cacheManager->getCache($key, $store_locally, $max_rebuild_seconds);
 	}
 
 	/**
 	 * Stores new $value in cache with $key name
 	 *
 	 * @param int $key key name to add to cache
 	 * @param mixed $value value of cached record
 	 * @param int $expiration when value expires (0 - doesn't expire)
 	 * @return bool
 	 * @access public
 	 */
 	public function setCache($key, $value, $expiration = 0)
 	{
 		return $this->cacheManager->setCache($key, $value, $expiration);
 	}
 
 	/**
 	 * Stores new $value in cache with $key name (only if it's not there)
 	 *
 	 * @param int $key key name to add to cache
 	 * @param mixed $value value of cached record
 	 * @param int $expiration when value expires (0 - doesn't expire)
 	 * @return bool
 	 * @access public
 	 */
 	public function addCache($key, $value, $expiration = 0)
 	{
 		return $this->cacheManager->addCache($key, $value, $expiration);
 	}
 
 	/**
 	 * Sets rebuilding mode for given cache
 	 *
 	 * @param string $name
 	 * @param int $mode
 	 * @param int $max_rebuilding_time
 	 * @return bool
 	 * @access public
 	 */
 	public function rebuildCache($name, $mode = null, $max_rebuilding_time = 0)
 	{
 		return $this->cacheManager->rebuildCache($name, $mode, $max_rebuilding_time);
 	}
 
 	/**
 	 * Deletes key from cache
 	 *
 	 * @param string $key
 	 * @return void
 	 * @access public
 	 */
 	public function deleteCache($key)
 	{
 		$this->cacheManager->deleteCache($key);
 	}
 
 	/**
 	 * Reset's all memory cache at once
 	 *
 	 * @return void
 	 * @access public
 	 */
 	public function resetCache()
 	{
 		$this->cacheManager->resetCache();
 	}
 
 	/**
 	 * Returns value from database cache
 	 *
 	 * @param string $name key name
 	 * @param int $max_rebuild_seconds
 	 * @return mixed
 	 * @access public
 	 */
 	public function getDBCache($name, $max_rebuild_seconds = 0)
 	{
 		return $this->cacheManager->getDBCache($name, $max_rebuild_seconds);
 	}
 
 	/**
 	 * Sets value to database cache
 	 *
 	 * @param string $name
 	 * @param mixed $value
 	 * @param int|bool $expiration
 	 * @return void
 	 * @access public
 	 */
 	public function setDBCache($name, $value, $expiration = false)
 	{
 		$this->cacheManager->setDBCache($name, $value, $expiration);
 	}
 
 	/**
 	 * Sets rebuilding mode for given cache
 	 *
 	 * @param string $name
 	 * @param int $mode
 	 * @param int $max_rebuilding_time
 	 * @return bool
 	 * @access public
 	 */
 	public function rebuildDBCache($name, $mode = null, $max_rebuilding_time = 0)
 	{
 		return $this->cacheManager->rebuildDBCache($name, $mode, $max_rebuilding_time);
 	}
 
 	/**
 	 * Deletes key from database cache
 	 *
 	 * @param string $name
 	 * @return void
 	 * @access public
 	 */
 	public function deleteDBCache($name)
 	{
 		$this->cacheManager->deleteDBCache($name);
 	}
 
 	/**
 	 * Registers each module specific constants if any found
 	 *
 	 * @return bool
 	 * @access protected
 	 */
 	protected function registerModuleConstants()
 	{
 		if ( file_exists(KERNEL_PATH . '/constants.php') ) {
 			kUtil::includeOnce(KERNEL_PATH . '/constants.php');
 		}
 
 		if ( !$this->ModuleInfo ) {
 			return false;
 		}
 
 		foreach ($this->ModuleInfo as $module_info) {
 			$constants_file = FULL_PATH . '/' . $module_info['Path'] . 'constants.php';
 
 			if ( file_exists($constants_file) ) {
 				kUtil::includeOnce($constants_file);
 			}
 		}
 
 		return true;
 	}
 
 	/**
 	 * Performs redirect to hard maintenance template
 	 *
 	 * @return void
 	 * @access public
 	 */
 	public function redirectToMaintenance()
 	{
 		$maintenance_page = WRITEBALE_BASE . '/maintenance.html';
 		$query_string = ''; // $this->isAdmin ? '' : '?next_template=' . kUtil::escape($_SERVER['REQUEST_URI'], kUtil::ESCAPE_URL);
 
 		if ( file_exists(FULL_PATH . $maintenance_page) ) {
 			header('Location: ' . BASE_PATH . $maintenance_page . $query_string);
 			exit;
 		}
 	}
 
 	/**
 	 * Actually runs the parser against current template and stores parsing result
 	 *
 	 * This method gets 't' variable passed to the script, loads the template given in 't' variable and
 	 * parses it. The result is store in {@link $this->HTML} property.
 	 *
 	 * @return void
 	 * @access public
 	 */
 	public function Run()
 	{
 		// process maintenance mode redirect: begin
 		$maintenance_mode = $this->getMaintenanceMode();
 
 		if ( $maintenance_mode == MaintenanceMode::HARD ) {
 			$this->redirectToMaintenance();
 		}
 		elseif ( $maintenance_mode == MaintenanceMode::SOFT ) {
 			$maintenance_template = $this->isAdmin ? 'login' : $this->ConfigValue('SoftMaintenanceTemplate');
 
 			if ( $this->GetVar('t') != $maintenance_template ) {
 				$redirect_params = Array ();
 
 				if ( !$this->isAdmin ) {
 					$redirect_params['next_template'] = $_SERVER['REQUEST_URI'];
 				}
 
 				$this->Redirect($maintenance_template, $redirect_params);
 			}
 		}
 		// process maintenance mode redirect: end
 
 		if ( defined('DEBUG_MODE') && $this->isDebugMode() && kUtil::constOn('DBG_PROFILE_MEMORY') ) {
 			$this->Debugger->appendMemoryUsage('Application before Run:');
 		}
 
 		if ( $this->isAdminUser ) {
 			// for permission checking in events & templates
 			$this->LinkVar('module'); // for common configuration templates
 			$this->LinkVar('module_key'); // for common search templates
 			$this->LinkVar('section'); // for common configuration templates
 
 			if ( $this->GetVar('m_opener') == 'p' ) {
 				$this->LinkVar('main_prefix'); // window prefix, that opened selector
 				$this->LinkVar('dst_field'); // field to set value choosed in selector
 			}
 
 			if ( $this->GetVar('ajax') == 'yes' && !$this->GetVar('debug_ajax') ) {
 				// hide debug output from ajax requests automatically
 				kUtil::safeDefine('DBG_SKIP_REPORTING', 1); // safeDefine, because debugger also defines it
 			}
 		}
 		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'));
 
 			if ( $this->CheckAdminPermission('CATEGORY.MODIFY', 0, $this->getBaseCategory()) ) {
 				// user can edit cms blocks (when viewing front-end through admin's frame)
 				$editing_mode = $this->GetVar('editing_mode');
 				define('EDITING_MODE', $editing_mode ? $editing_mode : EDITING_MODE_BROWSE);
 			}
 		}
 
 		kUtil::safeDefine('EDITING_MODE', ''); // user can't edit anything
 		$this->Phrases->setPhraseEditing();
 
 		$this->EventManager->ProcessRequest();
 
 		$this->InitParser();
 		$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(), '/');
 
 			if ( defined('DEBUG_MODE') && $this->isDebugMode() ) {
 				$this->Debugger->appendHTML('<strong>Design Template</strong>: ' . $t . '; <strong>CategoryID</strong>: ' . $this->GetVar('m_cat_id'));
 			}
 		}
 		/*else {
 			$cms_handler->SetCatByTemplate();
 		}*/
 
 		if ( defined('DEBUG_MODE') && $this->isDebugMode() && kUtil::constOn('DBG_PROFILE_MEMORY') ) {
 			$this->Debugger->appendMemoryUsage('Application before Parsing:');
 		}
 
 		$this->HTML = $this->Parser->Run($t);
 
 		if ( defined('DEBUG_MODE') && $this->isDebugMode() && kUtil::constOn('DBG_PROFILE_MEMORY') ) {
 			$this->Debugger->appendMemoryUsage('Application after Parsing:');
 		}
 	}
 
 	/**
 	 * Returns console application.
 	 *
 	 * @return ConsoleApplication
 	 */
 	public function getConsoleApplication()
 	{
 		return $this->makeClass('InPortal\Core\kernel\Console\ConsoleApplication');
 	}
 
 	/**
 	 * Replaces current rendered template with given one.
 	 *
 	 * @param string|null $template Template.
 	 *
 	 * @return void
 	 */
 	public function QuickRun($template)
 	{
 		/** @var kThemesHelper $themes_helper */
 		$themes_helper = $this->recallObject('ThemesHelper');
 
 		// Set Web Request variables to affect link building on template itself.
 		$this->SetVar('t', $template);
 		$this->SetVar('m_cat_id', $themes_helper->getPageByTemplate($template));
 		$this->SetVar('passed', 'm');
 
 		// Replace current page content with given template.
 		$this->InitParser();
 		$this->Parser->Clear();
 		$this->HTML = $this->Parser->Run($template);
 	}
 
 	/**
 	 * Performs template parser/cache initialization
 	 *
 	 * @param bool|string $theme_name
 	 * @return void
 	 * @access public
 	 */
 	public function InitParser($theme_name = false)
 	{
 		if ( !is_object($this->Parser) ) {
 			$this->Parser = $this->recallObject('NParser');
 			$this->TemplatesCache = $this->recallObject('TemplatesCache');
 		}
 
 		$this->TemplatesCache->forceThemeName = $theme_name;
 	}
 
 	/**
 	 * Send the parser results to browser
 	 *
 	 * Actually send everything stored in {@link $this->HTML}, to the browser by echoing it.
 	 *
 	 * @return void
 	 * @access public
 	 */
 	public function Done()
 	{
 		$this->HandleEvent(new kEvent('adm:OnBeforeShutdown'));
 
 		$debug_mode = defined('DEBUG_MODE') && $this->isDebugMode();
 
 		if ( $debug_mode ) {
 			if ( kUtil::constOn('DBG_PROFILE_MEMORY') ) {
 				$this->Debugger->appendMemoryUsage('Application before Done:');
 			}
 
 			$this->Session->SaveData(); // adds session data to debugger report
 			$this->HTML = ob_get_clean() . $this->HTML . $this->Debugger->printReport(true);
 		}
 		else {
 			// send "Set-Cookie" header before any output is made
 			$this->Session->SetSession();
 			$this->HTML = ob_get_clean() . $this->HTML;
 		}
 
 		$this->_outputPage();
 		$this->cacheManager->UpdateApplicationCache();
 
 		if ( !$debug_mode ) {
 			$this->Session->SaveData();
 		}
 
 		$this->EventManager->runScheduledTasks();
 
 		if ( defined('DBG_CAPTURE_STATISTICS') && DBG_CAPTURE_STATISTICS && !$this->isAdmin ) {
 			$this->_storeStatistics();
 		}
 	}
 
 	/**
 	 * Outputs generated page content to end-user
 	 *
 	 * @return void
 	 * @access protected
 	 */
 	protected function _outputPage()
 	{
 		$this->setContentType();
 		ob_start();
 
 		if ( $this->UseOutputCompression() ) {
 			$compression_level = $this->ConfigValue('OutputCompressionLevel');
 
 			if ( !$compression_level || $compression_level < 0 || $compression_level > 9 ) {
 				$compression_level = 7;
 			}
 
 			header('Content-Encoding: gzip');
 			echo gzencode($this->HTML, $compression_level);
 		}
 		else {
 			// when gzip compression not used connection won't be closed early!
 			echo $this->HTML;
 		}
 
 		// send headers to tell the browser to close the connection
 		header('Content-Length: ' . ob_get_length());
 		header('Connection: close');
 
 		// flush all output
 		ob_end_flush();
 
 		if ( ob_get_level() ) {
 			ob_flush();
 		}
 
 		flush();
 
 		// close current session
 		if ( session_id() ) {
 			session_write_close();
 		}
 	}
 
 	/**
 	 * Stores script execution statistics to database
 	 *
 	 * @return void
 	 * @access protected
 	 */
 	protected function _storeStatistics()
 	{
 		global $start;
 
 		$script_time = microtime(true) - $start;
 		$query_statistics = $this->Conn->getQueryStatistics(); // time & count
 
 		$sql = 'SELECT *
 				FROM ' . TABLE_PREFIX . 'StatisticsCapture
 				WHERE TemplateName = ' . $this->Conn->qstr($this->GetVar('t'));
 		$data = $this->Conn->GetRow($sql);
 
 		if ( $data ) {
 			$this->_updateAverageStatistics($data, 'ScriptTime', $script_time);
 			$this->_updateAverageStatistics($data, 'SqlTime', $query_statistics['time']);
 			$this->_updateAverageStatistics($data, 'SqlCount', $query_statistics['count']);
 
 			$data['Hits']++;
 			$data['LastHit'] = time();
 
 			$this->Conn->doUpdate($data, TABLE_PREFIX . 'StatisticsCapture', 'StatisticsId = ' . $data['StatisticsId']);
 		}
 		else {
 			$data['ScriptTimeMin'] = $data['ScriptTimeAvg'] = $data['ScriptTimeMax'] = $script_time;
 			$data['SqlTimeMin'] = $data['SqlTimeAvg'] = $data['SqlTimeMax'] = $query_statistics['time'];
 			$data['SqlCountMin'] = $data['SqlCountAvg'] = $data['SqlCountMax'] = $query_statistics['count'];
 			$data['TemplateName'] = $this->GetVar('t');
 			$data['Hits'] = 1;
 			$data['LastHit'] = time();
 			$this->Conn->doInsert($data, TABLE_PREFIX . 'StatisticsCapture');
 		}
 	}
 
 	/**
 	 * Calculates average time for statistics
 	 *
 	 * @param Array $data
 	 * @param string $field_prefix
 	 * @param float $current_value
 	 * @return void
 	 * @access protected
 	 */
 	protected function _updateAverageStatistics(&$data, $field_prefix, $current_value)
 	{
 		$data[$field_prefix . 'Avg'] = (($data['Hits'] * $data[$field_prefix . 'Avg']) + $current_value) / ($data['Hits'] + 1);
 
 		if ( $current_value < $data[$field_prefix . 'Min'] ) {
 			$data[$field_prefix . 'Min'] = $current_value;
 		}
 
 		if ( $current_value > $data[$field_prefix . 'Max'] ) {
 			$data[$field_prefix . 'Max'] = $current_value;
 		}
 	}
 
 	/**
 	 * Remembers slow query SQL and execution time into log
 	 *
 	 * @param string $slow_sql
 	 * @param int $time
 	 * @return void
 	 * @access public
 	 */
 	public function logSlowQuery($slow_sql, $time)
 	{
 		$query_crc = kUtil::crc32($slow_sql);
 
 		$sql = 'SELECT *
 				FROM ' . TABLE_PREFIX . 'SlowSqlCapture
 				WHERE QueryCrc = ' . $query_crc;
 		$data = $this->Conn->Query($sql, null, true);
 
 		if ( $data ) {
 			$this->_updateAverageStatistics($data, 'Time', $time);
 
 			$template_names = explode(',', $data['TemplateNames']);
 			array_push($template_names, $this->GetVar('t'));
 			$data['TemplateNames'] = implode(',', array_unique($template_names));
 
 			$data['Hits']++;
 			$data['LastHit'] = time();
 
 			$this->Conn->doUpdate($data, TABLE_PREFIX . 'SlowSqlCapture', 'CaptureId = ' . $data['CaptureId']);
 		}
 		else {
 			$data['TimeMin'] = $data['TimeAvg'] = $data['TimeMax'] = $time;
 			$data['SqlQuery'] = $slow_sql;
 			$data['QueryCrc'] = $query_crc;
 			$data['TemplateNames'] = $this->GetVar('t');
 			$data['Hits'] = 1;
 			$data['LastHit'] = time();
 
 			$this->Conn->doInsert($data, TABLE_PREFIX . 'SlowSqlCapture');
 		}
 	}
 
 	/**
 	 * Checks if output compression options is available
 	 *
 	 * @return bool
 	 * @access protected
 	 */
 	protected function UseOutputCompression()
 	{
 		if ( kUtil::constOn('IS_INSTALL') || kUtil::constOn('DBG_ZEND_PRESENT') || kUtil::constOn('SKIP_OUT_COMPRESSION') ) {
 			return false;
 		}
 
 		$accept_encoding = isset($_SERVER['HTTP_ACCEPT_ENCODING']) ? $_SERVER['HTTP_ACCEPT_ENCODING'] : '';
 
 		return $this->ConfigValue('UseOutputCompression') && function_exists('gzencode') && strstr($accept_encoding, 'gzip');
 	}
 
 	//	Facade
 
 	/**
 	 * Returns current session id (SID)
 	 *
 	 * @return int
 	 * @access public
 	 */
 	public function GetSID()
 	{
+		/** @var Session $session */
 		$session = $this->recallObject('Session');
-		/* @var $session Session */
 
 		return $session->GetID();
 	}
 
 	/**
 	 * Destroys current session
 	 *
 	 * @return void
 	 * @access public
 	 * @see UserHelper::logoutUser()
 	 */
 	public function DestroySession()
 	{
+		/** @var Session $session */
 		$session = $this->recallObject('Session');
-		/* @var $session Session */
 
 		$session->Destroy();
 	}
 
 	/**
 	 * Returns variable passed to the script as GET/POST/COOKIE
 	 *
 	 * @param string $name Name of variable to retrieve
 	 * @param mixed $default default value returned in case if variable not present
 	 * @return mixed
 	 * @access public
 	 */
 	public function GetVar($name, $default = false)
 	{
 		return isset($this->HttpQuery->_Params[$name]) ? $this->HttpQuery->_Params[$name] : $default;
 	}
 
 	/**
 	 * Removes forceful escaping done to the variable upon Front-End submission.
 	 *
 	 * @param string|array $value Value.
 	 *
 	 * @return string|array
 	 * @see    kHttpQuery::StripSlashes
 	 * @todo   Temporary method for marking problematic places to take care of, when forceful escaping will be removed.
 	 */
 	public function unescapeRequestVariable($value)
 	{
 		return $this->HttpQuery->unescapeRequestVariable($value);
 	}
 
 	/**
 	 * Returns variable passed to the script as $type
 	 *
 	 * @param string $name Name of variable to retrieve
 	 * @param string $type Get/Post/Cookie
 	 * @param mixed $default default value returned in case if variable not present
 	 * @return mixed
 	 * @access public
 	 */
 	public function GetVarDirect($name, $type, $default = false)
 	{
 //		$type = ucfirst($type);
 		$array = $this->HttpQuery->$type;
 
 		return isset($array[$name]) ? $array[$name] : $default;
 	}
 
 	/**
 	 * Returns ALL variables passed to the script as GET/POST/COOKIE
 	 *
 	 * @return Array
 	 * @access public
 	 * @deprecated
 	 */
 	public function GetVars()
 	{
 		return $this->HttpQuery->GetParams();
 	}
 
 	/**
 	 * Set the variable 'as it was passed to the script through GET/POST/COOKIE'
 	 *
 	 * This could be useful to set the variable when you know that
 	 * other objects would relay on variable passed from GET/POST/COOKIE
 	 * or you could use SetVar() / GetVar() pairs to pass the values between different objects.<br>
 	 *
 	 * @param string $var Variable name to set
 	 * @param mixed $val Variable value
 	 * @return void
 	 * @access public
 	 */
 	public function SetVar($var,$val)
 	{
 		$this->HttpQuery->Set($var, $val);
 	}
 
 	/**
 	 * Deletes kHTTPQuery variable
 	 *
 	 * @param string $var
 	 * @return void
 	 * @todo Think about method name
 	 */
 	public function DeleteVar($var)
 	{
 		$this->HttpQuery->Remove($var);
 	}
 
 	/**
 	 * Deletes Session variable
 	 *
 	 * @param string $var
 	 * @return void
 	 * @access public
 	 */
 	public function RemoveVar($var)
 	{
 		$this->Session->RemoveVar($var);
 	}
 
 	/**
 	 * Removes variable from persistent session
 	 *
 	 * @param string $var
 	 * @return void
 	 * @access public
 	 */
 	public function RemovePersistentVar($var)
 	{
 		$this->Session->RemovePersistentVar($var);
 	}
 
 	/**
 	 * Restores Session variable to it's db version
 	 *
 	 * @param string $var
 	 * @return void
 	 * @access public
 	 */
 	public function RestoreVar($var)
 	{
 		$this->Session->RestoreVar($var);
 	}
 
 	/**
 	 * Returns session variable value
 	 *
 	 * Return value of $var variable stored in Session. An optional default value could be passed as second parameter.
 	 *
 	 * @param string $var Variable name
 	 * @param mixed $default Default value to return if no $var variable found in session
 	 * @return mixed
 	 * @access public
 	 * @see Session::RecallVar()
 	 */
 	public function RecallVar($var,$default=false)
 	{
 		return $this->Session->RecallVar($var,$default);
 	}
 
 	/**
 	 * Returns variable value from persistent session
 	 *
 	 * @param string $var
 	 * @param mixed $default
 	 * @return mixed
 	 * @access public
 	 * @see Session::RecallPersistentVar()
 	 */
 	public function RecallPersistentVar($var, $default = false)
 	{
 		return $this->Session->RecallPersistentVar($var, $default);
 	}
 
 	/**
 	 * Stores variable $val in session under name $var
 	 *
 	 * Use this method to store variable in session. Later this variable could be recalled.
 	 *
 	 * @param string $var Variable name
 	 * @param mixed $val Variable value
 	 * @param bool $optional
 	 * @return void
 	 * @access public
 	 * @see kApplication::RecallVar()
 	 */
 	public function StoreVar($var, $val, $optional = false)
 	{
+		/** @var Session $session */
 		$session = $this->recallObject('Session');
-		/* @var $session Session */
 
 		$this->Session->StoreVar($var, $val, $optional);
 	}
 
 	/**
 	 * Stores variable to persistent session
 	 *
 	 * @param string $var
 	 * @param mixed $val
 	 * @param bool $optional
 	 * @return void
 	 * @access public
 	 */
 	public function StorePersistentVar($var, $val, $optional = false)
 	{
 		$this->Session->StorePersistentVar($var, $val, $optional);
 	}
 
 	/**
 	 * Stores default value for session variable
 	 *
 	 * @param string $var
 	 * @param string $val
 	 * @param bool $optional
 	 * @return void
 	 * @access public
 	 * @see Session::RecallVar()
 	 * @see Session::StoreVar()
 	 */
 	public function StoreVarDefault($var, $val, $optional = false)
 	{
+		/** @var Session $session */
 		$session = $this->recallObject('Session');
-		/* @var $session Session */
 
 		$this->Session->StoreVarDefault($var, $val, $optional);
 	}
 
 	/**
 	 * Links HTTP Query variable with session variable
 	 *
 	 * If variable $var is passed in HTTP Query it is stored in session for later use. If it's not passed it's recalled from session.
 	 * This method could be used for making sure that GetVar will return query or session value for given
 	 * variable, when query variable should overwrite session (and be stored there for later use).<br>
 	 * This could be used for passing item's ID into popup with multiple tab -
 	 * in popup script you just need to call LinkVar('id', 'current_id') before first use of GetVar('id').
 	 * After that you can be sure that GetVar('id') will return passed id or id passed earlier and stored in session
 	 *
 	 * @param string $var HTTP Query (GPC) variable name
 	 * @param mixed $ses_var Session variable name
 	 * @param mixed $default Default variable value
 	 * @param bool $optional
 	 * @return void
 	 * @access public
 	 */
 	public function LinkVar($var, $ses_var = null, $default = '', $optional = false)
 	{
 		if ( !isset($ses_var) ) {
 			$ses_var = $var;
 		}
 
 		if ( $this->GetVar($var) !== false ) {
 			$this->StoreVar($ses_var, $this->GetVar($var), $optional);
 		}
 		else {
 			$this->SetVar($var, $this->RecallVar($ses_var, $default));
 		}
 	}
 
 	/**
 	 * Returns variable from HTTP Query, or from session if not passed in HTTP Query
 	 *
 	 * The same as LinkVar, but also returns the variable value taken from HTTP Query if passed, or from session if not passed.
 	 * Returns the default value if variable does not exist in session and was not passed in HTTP Query
 	 *
 	 * @param string $var HTTP Query (GPC) variable name
 	 * @param mixed $ses_var Session variable name
 	 * @param mixed $default Default variable value
 	 * @return mixed
 	 * @access public
 	 * @see LinkVar
 	 */
 	public function GetLinkedVar($var, $ses_var = null, $default = '')
 	{
 		$this->LinkVar($var, $ses_var, $default);
 
 		return $this->GetVar($var);
 	}
 
 	/**
 	 * Renders given tag and returns it's output
 	 *
 	 * @param string $prefix
 	 * @param string $tag
 	 * @param Array $params
 	 * @return mixed
 	 * @access public
 	 * @see kApplication::InitParser()
 	 */
 	public function ProcessParsedTag($prefix, $tag, $params)
 	{
+		/** @var kDBTagProcessor $processor */
 		$processor = $this->Parser->GetProcessor($prefix);
-		/* @var $processor kDBTagProcessor */
 
 		return $processor->ProcessParsedTag($tag, $params, $prefix);
 	}
 
 	/**
 	 * Return object of IDBConnection interface
 	 *
 	 * Return object of IDBConnection interface already connected to the project database, configurable in config.php
 	 *
 	 * @return IDBConnection
 	 * @access public
 	 */
 	public function &GetADODBConnection()
 	{
 		return $this->Conn;
 	}
 
 	/**
 	 * Allows to parse given block name or include template
 	 *
 	 * @param Array $params Parameters to pass to block. Reserved parameter "name" used to specify block name.
 	 * @param bool $pass_params Forces to pass current parser params to this block/template. Use with caution, because you can accidentally pass "block_no_data" parameter.
 	 * @param bool $as_template
 	 * @return string
 	 * @access public
 	 */
 	public function ParseBlock($params, $pass_params = false, $as_template = false)
 	{
 		if ( substr($params['name'], 0, 5) == 'html:' ) {
 			return substr($params['name'], 5);
 		}
 
 		return $this->Parser->ParseBlock($params, $pass_params, $as_template);
 	}
 
 	/**
 	 * Checks, that we have given block defined
 	 *
 	 * @param string $name
 	 * @return bool
 	 * @access public
 	 */
 	public function ParserBlockFound($name)
 	{
 		return $this->Parser->blockFound($name);
 	}
 
 	/**
 	 * Allows to include template with a given name and given parameters
 	 *
 	 * @param Array $params Parameters to pass to template. Reserved parameter "name" used to specify template name.
 	 * @return string
 	 * @access public
 	 */
 	public function IncludeTemplate($params)
 	{
 		return $this->Parser->IncludeTemplate($params, isset($params['is_silent']) ? 1 : 0);
 	}
 
 	/**
 	 * Return href for template
 	 *
 	 * @param string $t Template path
 	 * @param string $prefix index.php prefix - could be blank, 'admin'
 	 * @param Array $params
 	 * @param string $index_file
 	 * @return string
 	 */
 	public function HREF($t, $prefix = '', $params = Array (), $index_file = null)
 	{
 		return $this->UrlManager->HREF($t, $prefix, $params, $index_file);
 	}
 
 	/**
 	 * Returns theme template filename and it's corresponding page_id based on given seo template
 	 *
 	 * @param string $seo_template
 	 * @return string
 	 * @access public
 	 */
 	public function getPhysicalTemplate($seo_template)
 	{
 		return $this->UrlManager->getPhysicalTemplate($seo_template);
 	}
 
 	/**
 	 * Returns seo template by physical template
 	 *
 	 * @param string $physical_template
 	 * @return string
 	 * @access public
 	 */
 	public function getSeoTemplate($physical_template)
 	{
 		return $this->UrlManager->getSeoTemplate($physical_template);
 	}
 
 	/**
 	 * Returns template name, that corresponds with given virtual (not physical) page id
 	 *
 	 * @param int $page_id
 	 * @return string|bool
 	 * @access public
 	 */
 	public function getVirtualPageTemplate($page_id)
 	{
 		return $this->UrlManager->getVirtualPageTemplate($page_id);
 	}
 
 	/**
 	 * Returns section template for given physical/virtual template
 	 *
 	 * @param string $template
 	 * @param int $theme_id
 	 * @return string
 	 * @access public
 	 */
 	public function getSectionTemplate($template, $theme_id = null)
 	{
 		return $this->UrlManager->getSectionTemplate($template, $theme_id);
 	}
 
 	/**
 	 * Returns variables with values that should be passed through with this link + variable list
 	 *
 	 * @param Array $params
 	 * @return Array
 	 * @access public
 	 */
 	public function getPassThroughVariables(&$params)
 	{
 		return $this->UrlManager->getPassThroughVariables($params);
 	}
 
 	/**
 	 * Builds url
 	 *
 	 * @param string $t
 	 * @param Array $params
 	 * @param string $pass
 	 * @param bool $pass_events
 	 * @param bool $env_var
 	 * @return string
 	 * @access public
 	 */
 	public function BuildEnv($t, $params, $pass = 'all', $pass_events = false, $env_var = true)
 	{
 		return $this->UrlManager->plain->build($t, $params, $pass, $pass_events, $env_var);
 	}
 
 	/**
 	 * Process QueryString only, create
 	 * events, ids, based on config
 	 * set template name and sid in
 	 * desired application variables.
 	 *
 	 * @param string $env_var environment string value
 	 * @param string $pass_name
 	 * @return Array
 	 * @access public
 	 */
 	public function processQueryString($env_var, $pass_name = 'passed')
 	{
 		return $this->UrlManager->plain->parse($env_var, $pass_name);
 	}
 
 	/**
 	 * Parses rewrite url and returns parsed variables
 	 *
 	 * @param string $url
 	 * @param string $pass_name
 	 * @return Array
 	 * @access public
 	 */
 	public function parseRewriteUrl($url, $pass_name = 'passed')
 	{
 		return $this->UrlManager->rewrite->parse($url, $pass_name);
 	}
 
 	/**
 	 * Returns base part of all urls, build on website
 	 *
 	 * @param string  $domain       Domain override.
 	 * @param boolean $ssl_redirect Redirect to/from SSL.
 	 *
 	 * @return string
 	 */
 	public function BaseURL($domain = '', $ssl_redirect = null)
 	{
 		if ( $ssl_redirect === null ) {
 			// stay on same encryption level
 			return PROTOCOL . ($domain ? $domain : SERVER_NAME) . (defined('PORT') ? ':' . PORT : '') . BASE_PATH . '/';
 		}
 
 		if ( $ssl_redirect ) {
 			// going from http:// to https://
 			$protocol = 'https://';
 			$domain = $this->getSecureDomain();
 		}
 		else {
 			// going from https:// to http://
 			$protocol = 'http://';
 			$domain = $this->siteDomainField('DomainName');
 
 			if ( $domain === false ) {
 				$domain = DOMAIN; // not on site domain
 			}
 		}
 
 		return $protocol . $domain . (defined('PORT') ? ':' . PORT : '') . BASE_PATH . '/';
 	}
 
 	/**
 	 * Returns secure domain.
 	 *
 	 * @return string
 	 */
 	public function getSecureDomain()
 	{
 		$ret = $this->isAdmin ? $this->ConfigValue('AdminSSLDomain') : false;
 
 		if ( !$ret ) {
 			$ssl_domain = $this->siteDomainField('SSLDomainName');
 
 			return strlen($ssl_domain) ? $ssl_domain : $this->ConfigValue('SSLDomain');
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Redirects user to url, that's build based on given parameters
 	 *
 	 * @param string $t
 	 * @param Array $params
 	 * @param string $prefix
 	 * @param string $index_file
 	 * @return void
 	 * @access public
 	 */
 	public function Redirect($t = '', $params = Array(), $prefix = '', $index_file = null)
 	{
 		$js_redirect = getArrayValue($params, 'js_redirect');
 
 		if ( $t == '' || $t === true ) {
 			$t = $this->GetVar('t');
 		}
 
 		// pass prefixes and special from previous url
 		if ( array_key_exists('js_redirect', $params) ) {
 			unset($params['js_redirect']);
 		}
 
 		// allows to send custom responce code along with redirect header
 		if ( array_key_exists('response_code', $params) ) {
 			$response_code = (int)$params['response_code'];
 			unset($params['response_code']);
 		}
 		else {
 			$response_code = 302; // Found
 		}
 
 		if ( !array_key_exists('pass', $params) ) {
 			$params['pass'] = 'all';
 		}
 
 		if ( $this->GetVar('ajax') == 'yes' && $t == $this->GetVar('t') ) {
 			// redirects to the same template as current
 			$params['ajax'] = 'yes';
 		}
 
 		$location = $this->HREF($t, $prefix, $params, $index_file);
 
 		if ( $this->isDebugMode() && (kUtil::constOn('DBG_REDIRECT') || (kUtil::constOn('DBG_RAISE_ON_WARNINGS') && $this->Debugger->WarningCount)) ) {
 			$this->Debugger->appendTrace();
 			echo '<strong>Debug output above !!!</strong><br/>' . "\n";
 
 			if ( array_key_exists('HTTP_REFERER', $_SERVER) ) {
 				echo 'Referer: <strong>' . kUtil::escape($_SERVER['HTTP_REFERER'], kUtil::ESCAPE_HTML) . '</strong><br/>' . "\n";
 			}
 
 			echo "Proceed to redirect: <a href=\"{$location}\">{$location}</a><br/>\n";
 		}
 		else {
 			if ( $js_redirect ) {
 				// show "redirect" template instead of redirecting,
 				// because "Set-Cookie" header won't work, when "Location"
 				// header is used later
 				$this->SetVar('t', 'redirect');
 				$this->SetVar('redirect_to', $location);
 
 				// make all additional parameters available on "redirect" template too
 				foreach ($params as $name => $value) {
 					$this->SetVar($name, $value);
 				}
 
 				return;
 			}
 			else {
 				if ( $this->GetVar('ajax') == 'yes' && ($t != $this->GetVar('t') || !$this->isSOPSafe($location, $t)) ) {
 					// redirection to other then current template during ajax request OR SOP violation
 					kUtil::safeDefine('DBG_SKIP_REPORTING', 1);
 					echo '#redirect#' . $location;
 				}
 				elseif ( headers_sent() != '' ) {
 					// some output occurred -> redirect using javascript
 					echo '<script type="text/javascript">window.location.href = \'' . kUtil::escape($location, kUtil::ESCAPE_JS) . '\';</script>';
 				}
 				else {
 					// no output before -> redirect using HTTP header
 
 //					header('HTTP/1.1 302 Found');
 					header('Location: ' . $location, true, $response_code);
 				}
 			}
 		}
 
 		// 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,
 			// that presumes that application was successfully initialized
 			$this->HandleEvent(new kEvent('adm:OnBeforeShutdown'));
 		}
 
 		$session->SaveData();
 
 		ob_end_flush();
 		exit;
 	}
 
 	/**
 	 * Determines if real redirect should be made within AJAX request.
 	 *
 	 * @param string $url      Location.
 	 * @param string $template Template.
 	 *
 	 * @return boolean
 	 * @link   http://en.wikipedia.org/wiki/Same-origin_policy
 	 */
 	protected function isSOPSafe($url, $template)
 	{
 		$parsed_url = parse_url($url);
 
 		if ( $parsed_url['scheme'] . '://' != PROTOCOL ) {
 			return false;
 		}
 
 		if ( $parsed_url['host'] != SERVER_NAME ) {
 			return false;
 		}
 
 		if ( defined('PORT') && isset($parsed_url['port']) && $parsed_url['port'] != PORT ) {
 			return false;
 		}
 
 		return true;
 	}
 
 	/**
 	 * Returns translation of given label
 	 *
 	 * @param string $label
 	 * @param bool $allow_editing return translation link, when translation is missing on current language
 	 * @param bool $use_admin use current Admin Console language to translate phrase
 	 * @return string
 	 * @access public
 	 */
 	public function Phrase($label, $allow_editing = true, $use_admin = false)
 	{
 		return $this->Phrases->GetPhrase($label, $allow_editing, $use_admin);
 	}
 
 	/**
 	 * Replace language tags in exclamation marks found in text
 	 *
 	 * @param string $text
 	 * @param bool $force_escape force escaping, not escaping of resulting string
 	 * @return string
 	 * @access public
 	 */
 	public function ReplaceLanguageTags($text, $force_escape = null)
 	{
 		return $this->Phrases->ReplaceLanguageTags($text, $force_escape);
 	}
 
 	/**
 	 * Checks if user is logged in, and creates
 	 * user object if so. User object can be recalled
 	 * later using "u.current" prefix_special. Also you may
 	 * get user id by getting "u.current_id" variable.
 	 *
 	 * @return void
 	 * @access protected
 	 */
 	protected function ValidateLogin()
 	{
+		/** @var Session $session */
 		$session = $this->recallObject('Session');
-		/* @var $session Session */
 
 		$user_id = $session->GetField('PortalUserId');
 
 		if ( !$user_id && $user_id != USER_ROOT ) {
 			$user_id = USER_GUEST;
 		}
 
 		$this->SetVar('u.current_id', $user_id);
 
 		if ( !$this->isAdmin ) {
 			// needed for "profile edit", "registration" forms ON FRONT ONLY
 			$this->SetVar('u_id', $user_id);
 		}
 
 		$this->StoreVar('user_id', $user_id, $user_id == USER_GUEST); // storing Guest user_id (-2) is optional
 
 		$this->isAdminUser = $this->isAdmin && $this->LoggedIn();
 
 		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');
 		}
 
 		$this->HandleEvent(new kEvent('adm:OnLogHttpRequest'));
 
 		if ( $user_id != USER_GUEST ) {
 			// normal users + root
 			$this->LoadPersistentVars();
 		}
 
 		$user_timezone = $this->Session->GetField('TimeZone');
 
 		if ( $user_timezone ) {
 			date_default_timezone_set($user_timezone);
 		}
 	}
 
 	/**
 	 * Loads current user persistent session data
 	 *
 	 * @return void
 	 * @access public
 	 */
 	public function LoadPersistentVars()
 	{
 		$this->Session->LoadPersistentVars();
 	}
 
 	/**
 	 * Returns configuration option value by name
 	 *
 	 * @param string $name
 	 * @return string
 	 * @access public
 	 */
 	public function ConfigValue($name)
 	{
 		return $this->cacheManager->ConfigValue($name);
 	}
 
 	/**
 	 * Changes value of individual configuration variable (+resets cache, when needed)
 	 *
 	 * @param string $name
 	 * @param string $value
 	 * @param bool $local_cache_only
 	 * @return string
 	 * @access public
 	 */
 	public function SetConfigValue($name, $value, $local_cache_only = false)
 	{
 		return $this->cacheManager->SetConfigValue($name, $value, $local_cache_only);
 	}
 
 	/**
 	 * Allows to process any type of event.
 	 *
 	 * @param kEvent $event Event.
 	 *
 	 * @return void
 	 */
 	public function HandleEvent(kEvent $event)
 	{
 		$this->EventManager->HandleEvent($event);
 	}
 
 	/**
 	 * Notifies event subscribers, that event has occured
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 */
 	public function notifyEventSubscribers(kEvent $event)
 	{
 		$this->EventManager->notifySubscribers($event);
 	}
 
 	/**
 	 * Allows to process any type of event
 	 *
 	 * @param kEvent $event
 	 * @return bool
 	 * @access public
 	 */
 	public function eventImplemented(kEvent $event)
 	{
 		return $this->EventManager->eventImplemented($event);
 	}
 
 	/**
 	 * Registers new class in the factory
 	 *
 	 * @param string $real_class Real name of class as in class declaration
 	 * @param string $file Filename in what $real_class is declared
 	 * @param string $pseudo_class Name under this class object will be accessed using getObject method
 	 * @return void
 	 * @access public
 	 */
 	public function registerClass($real_class, $file, $pseudo_class = null)
 	{
 		$this->Factory->registerClass($real_class, $file, $pseudo_class);
 	}
 
 	/**
 	 * Unregisters existing class from factory
 	 *
 	 * @param string $real_class Real name of class as in class declaration
 	 * @param string $pseudo_class Name under this class object is accessed using getObject method
 	 * @return void
 	 * @access public
 	 */
 	public function unregisterClass($real_class, $pseudo_class = null)
 	{
 		$this->Factory->unregisterClass($real_class, $pseudo_class);
 	}
 
 	/**
 	 * Finds the absolute path to the file where the class is defined.
 	 *
 	 * @param string $class The name of the class.
 	 *
 	 * @return string|false
 	 */
 	public function findClassFile($class)
 	{
 		return $this->Factory->findClassFile($class);
 	}
 
 	/**
 	 * Add new scheduled task
 	 *
 	 * @param string $short_name name to be used to store last maintenance run info
 	 * @param string $event_string
 	 * @param int $run_schedule run schedule like for Cron
 	 * @param string $module
 	 * @param int $status
 	 * @access public
 	 */
 	public function registerScheduledTask($short_name, $event_string, $run_schedule, $module, $status = STATUS_ACTIVE)
 	{
 		$this->EventManager->registerScheduledTask($short_name, $event_string, $run_schedule, $module, $status);
 	}
 
 	/**
 	 * Registers Hook from subprefix event to master prefix event
 	 *
 	 * Pattern: Observer
 	 *
 	 * @param string $hook_event
 	 * @param string $do_event
 	 * @param int $mode
 	 * @param bool $conditional
 	 * @access public
 	 */
 	public function registerHook($hook_event, $do_event, $mode = hAFTER, $conditional = false)
 	{
 		$this->EventManager->registerHook($hook_event, $do_event, $mode, $conditional);
 	}
 
 	/**
 	 * Registers build event for given pseudo class
 	 *
 	 * @param string $pseudo_class
 	 * @param string $event_name
 	 * @access public
 	 */
 	public function registerBuildEvent($pseudo_class, $event_name)
 	{
 		$this->EventManager->registerBuildEvent($pseudo_class, $event_name);
 	}
 
 	/**
 	 * Allows one TagProcessor tag act as other TagProcessor tag
 	 *
 	 * @param Array $tag_info
 	 * @return void
 	 * @access public
 	 */
 	public function registerAggregateTag($tag_info)
 	{
+		/** @var kArray $aggregator */
 		$aggregator = $this->recallObject('TagsAggregator', 'kArray');
-		/* @var $aggregator kArray */
 
 		$tag_data = Array (
 			$tag_info['LocalPrefix'],
 			$tag_info['LocalTagName'],
 			getArrayValue($tag_info, 'LocalSpecial')
 		);
 
 		$aggregator->SetArrayValue($tag_info['AggregateTo'], $tag_info['AggregatedTagName'], $tag_data);
 	}
 
 	/**
 	 * Returns object using params specified, creates it if is required
 	 *
 	 * @param string $name
 	 * @param string $pseudo_class
 	 * @param Array $event_params
 	 * @param Array $arguments
 	 * @return kBase
 	 */
 	public function recallObject($name, $pseudo_class = null, array $event_params = array(), array $arguments = array())
 	{
 		/*if ( !$this->hasObject($name) && $this->isDebugMode() && ($name == '_prefix_here_') ) {
 			// first time, when object with "_prefix_here_" prefix is accessed
 			$this->Debugger->appendTrace();
 		}*/
 
 		return $this->Factory->getObject($name, $pseudo_class, $event_params, $arguments);
 	}
 
 	/**
 	 * Returns tag processor for prefix specified
 	 *
 	 * @param string $prefix
 	 * @return kDBTagProcessor
 	 * @access public
 	 */
 	public function recallTagProcessor($prefix)
 	{
 		$this->InitParser(); // because kDBTagProcesor is in NParser dependencies
 
 		return $this->recallObject($prefix . '_TagProcessor');
 	}
 
 	/**
 	 * Checks if object with prefix passes was already created in factory
 	 *
 	 * @param string $name object pseudo_class, prefix
 	 * @return bool
 	 * @access public
 	 */
 	public function hasObject($name)
 	{
 		return $this->Factory->hasObject($name);
 	}
 
 	/**
 	 * Removes object from storage by given name
 	 *
 	 * @param string $name Object's name in the Storage
 	 * @return void
 	 * @access public
 	 */
 	public function removeObject($name)
 	{
 		$this->Factory->DestroyObject($name);
 	}
 
 	/**
 	 * Get's real class name for pseudo class, includes class file and creates class instance
 	 *
 	 * Pattern: Factory Method
 	 *
 	 * @param string $pseudo_class
 	 * @param Array $arguments
 	 * @return kBase
 	 * @access public
 	 */
 	public function makeClass($pseudo_class, array $arguments = array())
 	{
 		return $this->Factory->makeClass($pseudo_class, $arguments);
 	}
 
 	/**
 	 * Returns sub-classes of given ancestor class.
 	 *
 	 * @param string  $ancestor_class Ancestor class.
 	 * @param boolean $concrete_only  Return only non-abstract classes.
 	 *
 	 * @return array
 	 */
 	public function getSubClasses($ancestor_class, $concrete_only = true)
 	{
 		return $this->Factory->getSubClasses($ancestor_class, $concrete_only);
 	}
 
 	/**
 	 * Checks if application is in debug mode
 	 *
 	 * @param bool $check_debugger check if kApplication debugger is initialized too, not only for defined DEBUG_MODE constant
 	 * @return bool
 	 * @author Alex
 	 * @access public
 	 */
 	public function isDebugMode($check_debugger = true)
 	{
 		$debug_mode = defined('DEBUG_MODE') && DEBUG_MODE;
 		if ($check_debugger) {
 			$debug_mode = $debug_mode && is_object($this->Debugger);
 		}
 		return $debug_mode;
 	}
 
 	/**
 	 * Apply url rewriting used by mod_rewrite or not
 	 *
 	 * @param bool|null $ssl Force ssl link to be build
 	 * @return bool
 	 * @access public
 	 */
 	public function RewriteURLs($ssl = false)
 	{
 		// case #1,#4:
 		//			we want to create https link from http mode
 		//			we want to create https link from https mode
 		//			conditions: ($ssl || PROTOCOL == 'https://') && $this->ConfigValue('UseModRewriteWithSSL')
 
 		// case #2,#3:
 		//			we want to create http link from https mode
 		//			we want to create http link from http mode
 		//			conditions: !$ssl && (PROTOCOL == 'https://' || PROTOCOL == 'http://')
 
 		$allow_rewriting =
 			(!$ssl && (PROTOCOL == 'https://' || PROTOCOL == 'http://')) // always allow mod_rewrite for http
 			|| // or allow rewriting for redirect TO httpS or when already in httpS
 			(($ssl || PROTOCOL == 'https://') && $this->ConfigValue('UseModRewriteWithSSL')); // but only if it's allowed in config!
 
 		return kUtil::constOn('MOD_REWRITE') && $allow_rewriting;
 	}
 
 	/**
 	 * Returns unit config for given prefix
 	 *
 	 * @param string $prefix
 	 * @return kUnitConfig
 	 * @access public
 	 */
 	public function getUnitConfig($prefix)
 	{
 		return $this->UnitConfigReader->getUnitConfig($prefix);
 	}
 
 
 	/**
 	 * Returns true if config exists and is allowed for reading
 	 *
 	 * @param string $prefix
 	 * @return bool
 	 */
 	public function prefixRegistred($prefix)
 	{
 		return $this->UnitConfigReader->prefixRegistered($prefix);
 	}
 
 	/**
 	 * Splits any mixing of prefix and
 	 * special into correct ones
 	 *
 	 * @param string $prefix_special
 	 * @return Array
 	 * @access public
 	 */
 	public function processPrefix($prefix_special)
 	{
 		return $this->Factory->processPrefix($prefix_special);
 	}
 
 	/**
 	 * Set's new event for $prefix_special
 	 * passed
 	 *
 	 * @param string $prefix_special
 	 * @param string $event_name
 	 * @return void
 	 * @access public
 	 */
 	public function setEvent($prefix_special, $event_name)
 	{
 		$this->EventManager->setEvent($prefix_special, $event_name);
 	}
 
 	/**
 	 * SQL Error Handler
 	 *
 	 * @param int $code
 	 * @param string $msg
 	 * @param string $sql
 	 * @return bool
 	 * @access public
 	 * @throws Exception
 	 * @deprecated
 	 */
 	public function handleSQLError($code, $msg, $sql)
 	{
 		return $this->_logger->handleSQLError($code, $msg, $sql);
 	}
 
 	/**
 	 * Returns & blocks next ResourceId available in system
 	 *
 	 * @return int
 	 * @access public
 	 */
 	public function NextResourceId()
 	{
 		$table_name = TABLE_PREFIX . 'IdGenerator';
 
 		$this->Conn->Query('LOCK TABLES ' . $table_name . ' WRITE');
 		$this->Conn->Query('UPDATE ' . $table_name . ' SET lastid = lastid + 1');
 		$id = $this->Conn->GetOne('SELECT lastid FROM ' . $table_name);
 
 		if ( $id === false ) {
 			$this->Conn->Query('INSERT INTO ' . $table_name . ' (lastid) VALUES (2)');
 			$id = 2;
 		}
 
 		$this->Conn->Query('UNLOCK TABLES');
 
 		return $id - 1;
 	}
 
 	/**
 	 * Returns genealogical main prefix for sub-table prefix passes
 	 * OR prefix, that has been found in REQUEST and some how is parent of passed sub-table prefix
 	 *
 	 * @param string $current_prefix
 	 * @param bool $real_top if set to true will return real topmost prefix, regardless of its id is passed or not
 	 * @return string
 	 * @access public
 	 */
 	public function GetTopmostPrefix($current_prefix, $real_top = false)
 	{
 		// 1. get genealogical tree of $current_prefix
 		$prefixes = Array ($current_prefix);
 		while ($parent_prefix = $this->getUnitConfig($current_prefix)->getParentPrefix()) {
 			if ( !$this->prefixRegistred($parent_prefix) ) {
 				// stop searching, when parent prefix is not registered
 				break;
 			}
 
 			$current_prefix = $parent_prefix;
 			array_unshift($prefixes, $current_prefix);
 		}
 
 		if ( $real_top ) {
 			return $current_prefix;
 		}
 
 		// 2. find what if parent is passed
 		$passed = explode(',', $this->GetVar('all_passed'));
 		foreach ($prefixes as $a_prefix) {
 			if ( in_array($a_prefix, $passed) ) {
 				return $a_prefix;
 			}
 		}
 
 		return $current_prefix;
 	}
 
 	/**
 	 * Triggers email event of type Admin
 	 *
 	 * @param string $email_template_name
 	 * @param int $to_user_id
 	 * @param array $send_params associative array of direct send params, possible keys: to_email, to_name, from_email, from_name, message, message_text
 	 * @return kEvent
 	 * @access public
 	 */
 	public function emailAdmin($email_template_name, $to_user_id = null, $send_params = Array ())
 	{
 		return $this->_email($email_template_name, EmailTemplate::TEMPLATE_TYPE_ADMIN, $to_user_id, $send_params);
 	}
 
 	/**
 	 * Triggers email event of type User
 	 *
 	 * @param string $email_template_name
 	 * @param int $to_user_id
 	 * @param array $send_params associative array of direct send params, possible keys: to_email, to_name, from_email, from_name, message, message_text
 	 * @return kEvent
 	 * @access public
 	 */
 	public function emailUser($email_template_name, $to_user_id = null, $send_params = Array ())
 	{
 		return $this->_email($email_template_name, EmailTemplate::TEMPLATE_TYPE_FRONTEND, $to_user_id, $send_params);
 	}
 
 	/**
 	 * Triggers general email event
 	 *
 	 * @param string $email_template_name
 	 * @param int $email_template_type (0 for User, 1 for Admin)
 	 * @param int $to_user_id
 	 * @param array $send_params associative array of direct send params,
 	 *  possible keys: to_email, to_name, from_email, from_name, message, message_text
 	 * @return kEvent
 	 * @access protected
 	 */
 	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;
 		}
 
 		$email->setParams($send_params);
 
 		return $email->send($to_user_id);
 	}
 
 	/**
 	 * Allows to check if user in this session is logged in or not
 	 *
 	 * @return bool
 	 * @access public
 	 */
 	public function LoggedIn()
 	{
 		// no session during expiration process
 		return is_null($this->Session) ? false : $this->Session->LoggedIn();
 	}
 
 	/**
 	 * Check current user permissions based on it's group permissions in specified category
 	 *
 	 * @param string $name permission name
 	 * @param int $cat_id category id, current used if not specified
 	 * @param int $type permission type {1 - system, 0 - per category}
 	 * @return int
 	 * @access public
 	 */
 	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);
 	}
 
 	/**
 	 * Check current admin permissions based on it's group permissions in specified category
 	 *
 	 * @param string $name permission name
 	 * @param int $cat_id category id, current used if not specified
 	 * @param int $type permission type {1 - system, 0 - per category}
 	 * @return int
 	 * @access public
 	 */
 	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);
 	}
 
 	/**
 	 * Set's any field of current visit
 	 *
 	 * @param string $field
 	 * @param mixed $value
 	 * @return void
 	 * @access public
 	 * @todo move to separate module
 	 */
 	public function setVisitField($field, $value)
 	{
 		if ( $this->isAdmin || !$this->ConfigValue('UseVisitorTracking') ) {
 			// admin logins are not registered in visits list
 			return;
 		}
 
+		/** @var kDBItem $visit */
 		$visit = $this->recallObject('visits', null, Array ('raise_warnings' => 0));
-		/* @var $visit kDBItem */
 
 		if ( $visit->isLoaded() ) {
 			$visit->SetDBField($field, $value);
 			$visit->Update();
 		}
 	}
 
 	/**
 	 * Allows to check if in-portal is installed
 	 *
 	 * @return bool
 	 * @access public
 	 */
 	public function isInstalled()
 	{
 		return $this->InitDone && (count($this->ModuleInfo) > 0);
 	}
 
 	/**
 	 * Allows to determine if module is installed & enabled
 	 *
 	 * @param string $module_name
 	 * @return bool
 	 * @access public
 	 */
 	public function isModuleEnabled($module_name)
 	{
 		return $this->findModule('Name', $module_name) !== false;
 	}
 
 	/**
 	 * Returns Window ID of passed prefix main prefix (in edit mode)
 	 *
 	 * @param string $prefix
 	 * @return int
 	 * @access public
 	 */
 	public function GetTopmostWid($prefix)
 	{
 		$top_prefix = $this->GetTopmostPrefix($prefix);
 		$mode = $this->GetVar($top_prefix . '_mode');
 
 		return $mode != '' ? substr($mode, 1) : '';
 	}
 
 	/**
 	 * Get temp table name
 	 *
 	 * @param string $table
 	 * @param mixed $wid
 	 * @return string
 	 * @access public
 	 */
 	public function GetTempName($table, $wid = '')
 	{
 		return $this->GetTempTablePrefix($wid) . $table;
 	}
 
 	/**
 	 * Builds temporary table prefix based on given window id
 	 *
 	 * @param string $wid
 	 * @return string
 	 * @access public
 	 */
 	public function GetTempTablePrefix($wid = '')
 	{
 		if ( preg_match('/prefix:(.*)/', $wid, $regs) ) {
 			$wid = $this->GetTopmostWid($regs[1]);
 		}
 
 		return TABLE_PREFIX . 'ses_' . $this->GetSID() . ($wid ? '_' . $wid : '') . '_edit_';
 	}
 
 	/**
 	 * Checks if given table is a temporary table
 	 *
 	 * @param string $table
 	 * @return bool
 	 * @access public
 	 */
 	public function IsTempTable($table)
 	{
 		static $cache = Array ();
 
 		if ( !array_key_exists($table, $cache) ) {
 			$cache[$table] = preg_match('/' . TABLE_PREFIX . 'ses_' . $this->GetSID() . '(_[\d]+){0,1}_edit_(.*)/', $table);
 		}
 
 		return (bool)$cache[$table];
 	}
 
 	/**
 	 * Checks, that given prefix is in temp mode
 	 *
 	 * @param string $prefix
 	 * @param string $special
 	 * @return bool
 	 * @access public
 	 */
 	public function IsTempMode($prefix, $special = '')
 	{
 		$top_prefix = $this->GetTopmostPrefix($prefix);
 
 		$var_names = Array (
 			$top_prefix,
 			rtrim($top_prefix . '_' . $special, '_'), // from post
 			rtrim($top_prefix . '.' . $special, '.'), // assembled locally
 		);
 
 		$var_names = array_unique($var_names);
 
 		$temp_mode = false;
 		foreach ($var_names as $var_name) {
 			$value = $this->GetVar($var_name . '_mode');
 
 			if ( $value && (substr($value, 0, 1) == 't') ) {
 				$temp_mode = true;
 				break;
 			}
 		}
 
 		return $temp_mode;
 	}
 
 	/**
 	 * Return live table name based on temp table name
 	 *
 	 * @param string $temp_table
 	 * @return string
 	 */
 	public function GetLiveName($temp_table)
 	{
 		if ( preg_match('/' . TABLE_PREFIX . 'ses_' . $this->GetSID() . '(_[\d]+){0,1}_edit_(.*)/', $temp_table, $rets) ) {
 			// cut wid from table end if any
 			return $rets[2];
 		}
 		else {
 			return $temp_table;
 		}
 	}
 
 	/**
 	 * Stops processing of user request and displays given message
 	 *
 	 * @param string $message
 	 * @access public
 	 */
 	public function ApplicationDie($message = '')
 	{
 		while ( ob_get_level() ) {
 			ob_end_clean();
 		}
 
 		if ( $this->isDebugMode() ) {
 			$message .= $this->Debugger->printReport(true);
 		}
 
 		$this->HTML = $message;
 		$this->_outputPage();
 	}
 
 	/**
 	 * Returns comma-separated list of groups from given user
 	 *
 	 * @param int $user_id
 	 * @return string
 	 */
 	public function getUserGroups($user_id)
 	{
 		switch ($user_id) {
 			case USER_ROOT:
 				$user_groups = $this->ConfigValue('User_LoggedInGroup');
 				break;
 
 			case USER_GUEST:
 				$user_groups = $this->ConfigValue('User_LoggedInGroup') . ',' . $this->ConfigValue('User_GuestGroup');
 				break;
 
 			default:
 				$sql = 'SELECT GroupId
 						FROM ' . TABLE_PREFIX . 'UserGroupRelations
 						WHERE PortalUserId = ' . (int)$user_id;
 				$res = $this->Conn->GetCol($sql);
 
 				$user_groups = Array ($this->ConfigValue('User_LoggedInGroup'));
 				if ( $res ) {
 					$user_groups = array_merge($user_groups, $res);
 				}
 
 				$user_groups = implode(',', $user_groups);
 		}
 
 		return $user_groups;
 	}
 
 
 	/**
 	 * Allows to detect if page is browsed by spider (293 scheduled_tasks supported)
 	 *
 	 * @return bool
 	 * @access public
 	 */
 	/*public function IsSpider()
 	{
 		static $is_spider = null;
 
 		if ( !isset($is_spider) ) {
 			$user_agent = trim($_SERVER['HTTP_USER_AGENT']);
 			$robots = file(FULL_PATH . '/core/robots_list.txt');
 			foreach ($robots as $robot_info) {
 				$robot_info = explode("\t", $robot_info, 3);
 				if ( $user_agent == trim($robot_info[2]) ) {
 					$is_spider = true;
 					break;
 				}
 			}
 		}
 
 		return $is_spider;
 	}*/
 
 	/**
 	 * Allows to detect table's presence in database
 	 *
 	 * @param string $table_name
 	 * @param bool $force
 	 * @return bool
 	 * @access public
 	 */
 	public function TableFound($table_name, $force = false)
 	{
 		return $this->Conn->TableFound($table_name, $force);
 	}
 
 	/**
 	 * Returns counter value
 	 *
 	 * @param string $name counter name
 	 * @param Array $params counter parameters
 	 * @param string $query_name specify query name directly (don't generate from parameters)
 	 * @param bool $multiple_results
 	 * @return mixed
 	 * @access public
 	 */
 	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);
 	}
 
 	/**
 	 * Resets counter, which are affected by one of specified tables
 	 *
 	 * @param string $tables comma separated tables list used in counting sqls
 	 * @return void
 	 * @access public
 	 */
 	public function resetCounters($tables)
 	{
 		if ( kUtil::constOn('IS_INSTALL') ) {
 			return;
 		}
 
+		/** @var kCountHelper $count_helper */
 		$count_helper = $this->recallObject('CountHelper');
-		/* @var $count_helper kCountHelper */
 
 		$count_helper->resetCounters($tables);
 	}
 
 	/**
 	 * Sends XML header + optionally displays xml heading
 	 *
 	 * @param string|bool $xml_version
 	 * @return string
 	 * @access public
 	 * @author Alex
 	 */
 	public function XMLHeader($xml_version = false)
 	{
 		$this->setContentType('text/xml');
 
 		return $xml_version ? '<?xml version="' . $xml_version . '" encoding="' . CHARSET . '"?>' : '';
 	}
 
 	/**
 	 * Returns category tree
 	 *
 	 * @param int $category_id
 	 * @return Array
 	 * @access public
 	 */
 	public function getTreeIndex($category_id)
 	{
 		$tree_index = $this->getCategoryCache($category_id, 'category_tree');
 
 		if ( $tree_index ) {
 			$ret = Array ();
 			list ($ret['TreeLeft'], $ret['TreeRight']) = explode(';', $tree_index);
 
 			return $ret;
 		}
 
 		return false;
 	}
 
 	/**
 	 * Base category of all categories
 	 * Usually replaced category, with ID = 0 in category-related operations.
 	 *
 	 * @return int
 	 * @access public
 	 */
 	public function getBaseCategory()
 	{
 		// same, what $this->findModule('Name', 'Core', 'RootCat') does
 		// don't cache while IS_INSTALL, because of kInstallToolkit::createModuleCategory and upgrade
 
 		return $this->ModuleInfo['Core']['RootCat'];
 	}
 
 	/**
 	 * Deletes all data, that was cached during unit config parsing (excluding unit config locations)
 	 *
 	 * @param Array $config_variables
 	 * @access public
 	 */
 	public function DeleteUnitCache($config_variables = null)
 	{
 		$this->cacheManager->DeleteUnitCache($config_variables);
 	}
 
 	/**
 	 * Deletes cached section tree, used during permission checking and admin console tree display
 	 *
 	 * @return void
 	 * @access public
 	 */
 	public function DeleteSectionCache()
 	{
 		$this->cacheManager->DeleteSectionCache();
 	}
 
 	/**
 	 * Sets data from cache to object
 	 *
 	 * @param Array $data
 	 * @access public
 	 */
 	public function setFromCache(&$data)
 	{
 		$this->Factory->setFromCache($data);
 		$this->UnitConfigReader->setFromCache($data);
 		$this->EventManager->setFromCache($data);
 
 		$this->ReplacementTemplates = $data['Application.ReplacementTemplates'];
 		$this->routers = $data['Application.Routers'];
 		$this->ModuleInfo = $data['Application.ModuleInfo'];
 	}
 
 	/**
 	 * Gets object data for caching
 	 * The following caches should be reset based on admin interaction (adjusting config, enabling modules etc)
 	 *
 	 * @access public
 	 * @return Array
 	 */
 	public function getToCache()
 	{
 		return array_merge(
 			$this->Factory->getToCache(),
 			$this->UnitConfigReader->getToCache(),
 			$this->EventManager->getToCache(),
 			Array (
 				'Application.ReplacementTemplates' => $this->ReplacementTemplates,
 				'Application.Routers' => $this->routers,
 				'Application.ModuleInfo' => $this->ModuleInfo,
 			)
 		);
 	}
 
 	public function delayUnitProcessing($method, $params)
 	{
 		$this->cacheManager->delayUnitProcessing($method, $params);
 	}
 
 	/**
 	 * Returns current maintenance mode state
 	 *
 	 * @param bool $check_ips
 	 * @return int
 	 * @access public
 	 */
 	public function getMaintenanceMode($check_ips = true)
 	{
 		$exception_ips = defined('MAINTENANCE_MODE_IPS') ? MAINTENANCE_MODE_IPS : '';
 		$setting_name = $this->isAdmin ? 'MAINTENANCE_MODE_ADMIN' : 'MAINTENANCE_MODE_FRONT';
 
 		if ( defined($setting_name) && constant($setting_name) > MaintenanceMode::NONE ) {
 			$exception_ip = $check_ips ? kUtil::ipMatch($exception_ips) : false;
 
 			if ( !$exception_ip ) {
 				return constant($setting_name);
 			}
 		}
 
 		return MaintenanceMode::NONE;
 	}
 
 	/**
 	 * Sets content type of the page
 	 *
 	 * @param string $content_type
 	 * @param bool $include_charset
 	 * @return void
 	 * @access public
 	 */
 	public function setContentType($content_type = 'text/html', $include_charset = null)
 	{
 		static $already_set = false;
 
 		if ( $already_set ) {
 			return;
 		}
 
 		$header = 'Content-type: ' . $content_type;
 
 		if ( !isset($include_charset) ) {
 			$include_charset = $content_type = 'text/html' || $content_type == 'text/plain' || $content_type = 'text/xml';
 		}
 
 		if ( $include_charset ) {
 			$header .= '; charset=' . CHARSET;
 		}
 
 		$already_set = true;
 		header($header);
 	}
 
 	/**
 	 * Posts message to event log
 	 *
 	 * @param string $message
 	 * @param int $code
 	 * @param bool $write_now Allows further customization of log record by returning kLog object
 	 * @return bool|int|kLogger
 	 * @access public
 	 */
 	public function log($message, $code = null, $write_now = false)
 	{
 		$log = $this->_logger->prepare($message, $code)->addSource($this->_logger->createTrace(null, 1));
 
 		if ( $write_now ) {
 			return $log->write();
 		}
 
 		return $log;
 	}
 
 	/**
 	 * Deletes log with given id from database or disk, when database isn't available
 	 *
 	 * @param int $unique_id
 	 * @param int $storage_medium
 	 * @return void
 	 * @access public
 	 * @throws InvalidArgumentException
 	 */
 	public function deleteLog($unique_id, $storage_medium = kLogger::LS_AUTOMATIC)
 	{
 		$this->_logger->delete($unique_id, $storage_medium);
 	}
 
 	/**
 	 * Returns the client IP address.
 	 *
 	 * @return string The client IP address
 	 * @access public
 	 */
 	public function getClientIp()
 	{
 		return $this->HttpQuery->getClientIp();
 	}
 }
Index: branches/5.3.x/core/kernel/managers/scheduled_task_manager.php
===================================================================
--- branches/5.3.x/core/kernel/managers/scheduled_task_manager.php	(revision 16518)
+++ branches/5.3.x/core/kernel/managers/scheduled_task_manager.php	(revision 16519)
@@ -1,233 +1,233 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2010 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class kScheduledTaskManager extends kBase implements kiCacheable {
 
 	/**
 	 * Events, that should be run after parser initialization
 	 *
 	 * @var Array
 	 * @access protected
 	 */
 	protected $tasks = Array ();
 
 	/**
 	 * Sets data from cache to object
 	 *
 	 * @param Array $data
 	 * @access public
 	 */
 	public function setFromCache(&$data)
 	{
 		$this->tasks = $data['EventManager.scheduledTasks'];
 	}
 
 	/**
 	 * Gets object data for caching
 	 *
 	 * @return Array
 	 * @access public
 	 */
 	public function getToCache()
 	{
 		return Array (
 			'EventManager.scheduledTasks' => $this->tasks,
 		);
 	}
 
 	/**
 	 * Returns information about registered scheduled tasks
 	 *
 	 * @param bool $from_cache
 	 * @return Array
 	 * @access public
 	 */
 	public function getAll($from_cache = false)
 	{
 		static $scheduled_tasks = null;
 
 		if ( $from_cache ) {
 			return $this->tasks;
 		}
 
 		if ( !isset($scheduled_tasks) ) {
 			$timeout_clause = 'LastRunStatus = ' . ScheduledTask::LAST_RUN_RUNNING . ' AND Timeout > 0 AND ' . time() . ' - LastRunOn > Timeout';
 
 			$sql = 'SELECT *
 					FROM ' . $this->Application->getUnitConfig('scheduled-task')->getTableName() . '
 					WHERE (Status = ' . STATUS_ACTIVE . ') AND ((LastRunStatus != ' . ScheduledTask::LAST_RUN_RUNNING . ') OR (' . $timeout_clause . '))';
 			$scheduled_tasks = $this->Conn->Query($sql, 'Name');
 		}
 
 		return $scheduled_tasks;
 	}
 
 	/**
 	 * Add new scheduled task
 	 *
 	 * @param string $short_name name to be used to store last maintenance run info
 	 * @param string $event_string
 	 * @param int $run_schedule run schedule like for Cron
 	 * @param string $module
 	 * @param int $status
 	 * @access public
 	 */
 	public function add($short_name, $event_string, $run_schedule, $module, $status = STATUS_ACTIVE)
 	{
 		$this->tasks[$short_name] = Array (
 			'Event' => $event_string, 'RunSchedule' => $run_schedule, 'Module' => $module, 'Status' => $status
 		);
 	}
 
 	/**
 	 * Run registered scheduled tasks with specified event type
 	 *
 	 * @param bool $from_cron
 	 * @access public
 	 */
 	public function runAll($from_cron = false)
 	{
 		if ( defined('IS_INSTALL') ) {
 			return ;
 		}
 
 		$use_cron = $this->Application->ConfigValue('RunScheduledTasksFromCron');
 
 		if ( ($use_cron && !$from_cron) || (!$use_cron && $from_cron) ) {
 			// match execution place with one, set in config
 			return ;
 		}
 
 		ignore_user_abort(true);
 		set_time_limit(0);
 
 		$events_source = $this->getAll();
 
 		$user_id = $this->Application->RecallVar('user_id');
 		$this->Application->StoreVar('user_id', USER_ROOT, true); // to prevent permission checking inside events, true for optional storage
 
+		/** @var SiteHelper $site_helper */
 		$site_helper = $this->Application->recallObject('SiteHelper');
-		/* @var $site_helper SiteHelper */
 
 		$site_domain_id = $site_helper->getDomainByName('DomainName', DOMAIN);
 
 		foreach ($events_source as $short_name => $event_data) {
 			if ( $site_domain_id && $event_data['SiteDomainLimitation'] != '' ) {
 				$site_domains = explode('|', substr($event_data['SiteDomainLimitation'], 1, -1));
 
 				if ( !in_array($site_domain_id, $site_domains) ) {
 					// scheduled task isn't allowed on this site domain
 					continue;
 				}
 			}
 
 			// remember LastTimeoutOn only for events that are still running and will be reset
 			if ( $event_data['LastRunStatus'] == ScheduledTask::LAST_RUN_RUNNING ) {
 				$this->update($event_data, Array ('LastTimeoutOn' => time()));
 			}
 
 			$next_run = (int)$event_data['NextRunOn'];
 
 			if ($next_run && ($next_run > time())) {
 				continue;
 			}
 
 			$this->run($event_data);
 		}
 
 		$this->Application->StoreVar('user_id', $user_id, $user_id == USER_GUEST);
 	}
 
 	/**
 	 * Runs scheduled task based on given data
 	 *
 	 * @param Array $scheduled_task_data
 	 * @return bool
 	 * @access public
 	 */
 	public function run($scheduled_task_data)
 	{
 		$event = new kEvent($scheduled_task_data['Event']);
 
 		if ( !$this->Application->prefixRegistred($event->Prefix) ) {
 			// don't process scheduled tasks, left from disabled modules
 			return false;
 		}
 
+		/** @var kCronHelper $cron_helper */
 		$cron_helper = $this->Application->recallObject('kCronHelper');
-		/* @var $cron_helper kCronHelper */
 
 		$start_time = time();
 
 		// remember, when scheduled task execution started
 		$fields_hash = Array (
 			'LastRunOn' => $start_time,
 			'LastRunStatus' => ScheduledTask::LAST_RUN_RUNNING,
 			'NextRunOn' => $cron_helper->getMatch($scheduled_task_data['RunSchedule'], $start_time),
 		);
 
 		$this->update($scheduled_task_data, $fields_hash);
 
 		$scheduled_task = $this->Application->recallObject('scheduled-task', null, Array ('skip_autoload' => true));
 		/* @var $scheduled_task kDBItem */
 
 		$scheduled_task->LoadFromHash($scheduled_task_data);
 
 		$event->redirect = false;
 
 		// The fake MasterEvent is needed so that $event can access $scheduled_task!
 		$event->MasterEvent = new kEvent('scheduled-task:OnRun');
 		$this->Application->HandleEvent($event);
 
 		$now = time();
 		$next_run = $cron_helper->getMatch($scheduled_task_data['RunSchedule'], $start_time);
 
 		while ($next_run < $now) {
 			// in case event execution took longer, then RunSchedule (don't use <=, because RunSchedule can be 0)
 			$next_run = $cron_helper->getMatch($scheduled_task_data['RunSchedule'], $next_run);
 		}
 
 		// remember, when scheduled task execution ended
 		$fields_hash = Array (
 			'NextRunOn' => $next_run,
 			'RunTime' => $now - $start_time,
 			'LastRunStatus' => $event->status == kEvent::erSUCCESS ? ScheduledTask::LAST_RUN_SUCCEEDED : ScheduledTask::LAST_RUN_FAILED,
 		);
 
 		$this->update($scheduled_task_data, $fields_hash);
 
 		return true;
 	}
 
 	/**
 	 * Updates scheduled task record with latest changes about it's invocation progress
 	 *
 	 * @param Array $scheduled_task_data
 	 * @param Array $fields_hash
 	 * @return void
 	 * @access protected
 	 */
 	protected function update(&$scheduled_task_data, $fields_hash)
 	{
 		$this->Conn->doUpdate(
 			$fields_hash,
 			$this->Application->getUnitConfig('scheduled-task')->getTableName(),
 			'Name = ' . $this->Conn->qstr($scheduled_task_data['Name'])
 		);
 
 		$scheduled_task_data = array_merge($scheduled_task_data, $fields_hash);
 	}
 }
Index: branches/5.3.x/core/kernel/managers/url_manager.php
===================================================================
--- branches/5.3.x/core/kernel/managers/url_manager.php	(revision 16518)
+++ branches/5.3.x/core/kernel/managers/url_manager.php	(revision 16519)
@@ -1,500 +1,500 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2010 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class kUrlManager extends kBase {
 
 	/**
 	 * Processor of plain urls (initialized always)
 	 *
 	 * @var kPlainUrlProcessor
 	 * @access public
 	 */
 	public $plain = null;
 
 	/**
 	 * Processor of rewritten urls (initialized on demand only)
 	 *
 	 * @var kRewriteUrlProcessor
 	 * @access public
 	 */
 	public $rewrite = null;
 
 	/**
 	 * Tells, that rewrite system is ready
 	 *
 	 * @var bool
 	 * @access protected
 	 */
 	protected $rewriteReady = false;
 
 	/**
 	 * Physical template name mapping to their template names based in "Structure & Data" section
 	 *
 	 * @var Array
 	 */
 	protected $structureTemplateMapping = Array ();
 
 	/**
 	 * Creates instead of kUrlManager class
 	 */
 	public function __construct()
 	{
 		parent::__construct();
 
 		// don't use kApplication::recallObject, since it will call kApplication::EventManager, which isn't ready yet
 		$this->plain = $this->Application->makeClass('kPlainUrlProcessor', Array (&$this));
 	}
 
 	/**
 	 * Delay initialization of rewrite processor, since it uses site domains & http query
 	 *
 	 * @return void
 	 * @access public
 	 */
 	public function initRewrite()
 	{
 		if ( $this->rewriteReady ) {
 			return;
 		}
 
 		$this->rewrite = $this->Application->recallObject('kRewriteUrlProcessor', null, Array (), Array (&$this));
 		$this->rewriteReady = true;
 	}
 
 	/**
 	 * Return href for template
 	 *
 	 * @param string $t Template path
 	 * @param string $prefix index.php prefix - could be blank, 'admin'
 	 * @param Array $params
 	 * @param string $index_file
 	 * @return string
 	 */
 	public function HREF($t, $prefix = '', $params = Array (), $index_file = null)
 	{
 		if ( !$t ) {
 			// when template not specified, use current
 			$t = $this->Application->GetVar('t');
 		}
 
 		$t = preg_replace('/^Content\//i', '', $t);
 
 		if ( substr($t, -4) == '.tpl' ) {
 			// cut template extension (deprecated link format)
 			$t = substr($t, 0, strlen($t) - 4);
 		}
 
 		if ( substr($t, 0, 3) == 'id:' ) {
 			// link to structure page using it's id
 			$params['m_cat_id'] = substr($t, 3);
 			$t = $this->structureTemplateMapping[$t];
 		}
 
 		if ( array_key_exists('use_section', $params) ) {
 			$use_section = $params['use_section'];
 			unset($params['use_section']);
 		}
 
 		if ( isset($use_section) && $use_section ) {
 			$theme_id = isset($params['m_theme']) ? $params['m_theme'] : null;
 			$t = $this->getSectionTemplate($t, $theme_id);
 		}
 
 		if ( preg_match('/external:(.*)/', $t, $regs) ) {
 			// external url
 			return $regs[1];
 		}
 
 		if ( $this->Application->isAdmin && $prefix == '' ) {
 			$prefix = ADMIN_DIRECTORY;
 		}
 
 		if ( $this->Application->isAdmin && $prefix == '_FRONT_END_' ) {
 			$prefix = '';
 		}
 
 		if ( isset($params['_auto_prefix_']) ) {
 			unset($params['_auto_prefix_']); // this is parser-related param, do not need to pass it here
 		}
 
 		$ssl = isset($params['__SSL__']) ? $params['__SSL__'] : NULL;
 		if ( $ssl !== NULL ) {
+			/** @var Session $session */
 			$session = $this->Application->recallObject('Session');
-			/* @var $session Session */
 
 			$target_url = rtrim($this->Application->BaseURL('', $ssl), '/');
 			$cookie_url = trim($session->CookieDomain . $session->CookiePath, '/.');
 
 			// set session to GET_ONLY, to pass sid only if sid is REAL AND session is set
 			if ( !preg_match('#' . preg_quote($cookie_url) . '#', $target_url) && $session->SessionSet ) {
 				// when SSL<->NON-SSL redirect to different domain pass SID in url
 				$session->SetMode(Session::smGET_ONLY);
 			}
 		}
 
 		if ( isset($params['opener']) && $params['opener'] == 'u' ) {
 			$ret = $this->processPopupClose($prefix, $params);
 
 			if ( $ret !== false ) {
 				return $ret;
 			}
 			else {
 				//define('DBG_REDIRECT', 1);
 				$t = $this->Application->GetVar('t');
 			}
 		}
 
 		$pass = isset($params['pass']) ? $params['pass'] : '';
 
 		// pass events with url
 		$pass_events = false;
 		if ( isset($params['pass_events']) ) {
 			$pass_events = $params['pass_events'];
 			unset($params['pass_events']);
 		}
 
 		$map_link = '';
 		if ( isset($params['anchor']) ) {
 			$map_link = '#' . $params['anchor'];
 			unset($params['anchor']);
 		}
 
 		$rewrite = true;
 		if ( isset($params['__NO_REWRITE__']) ) {
 			$rewrite = false;
 			unset($params['__NO_REWRITE__']);
 		}
 
 		$force_rewrite = false;
 		if ( isset($params['__MOD_REWRITE__']) ) {
 			$force_rewrite = true;
 			unset($params['__MOD_REWRITE__']);
 		}
 
 		$force_no_sid = false;
 		if ( isset($params['__NO_SID__']) ) {
 			$force_no_sid = true;
 			unset($params['__NO_SID__']);
 		}
 
 		$domain = '';
 		if ( isset($params['domain']) ) {
 			$domain = $params['domain'];
 			unset($params['domain']);
 		}
 
 		// append pass through variables to each link to be build
 		$params = array_merge($this->getPassThroughVariables($params), $params);
 
 		$session = $this->Application->recallObject('Session');
 
 		if ( $session->NeedQueryString() && !$force_no_sid ) {
 			$params['sid'] = $this->Application->GetSID();
 		}
 
 		if ( $force_rewrite || ($this->Application->RewriteURLs($ssl) && $rewrite) ) {
 			if ( !$this->rewriteReady ) {
 				$this->initRewrite();
 			}
 
 			$url = $this->rewrite->build($t, $params, $pass, $pass_events);
 		}
 		else {
 			unset($params['pass_category']); // we don't need to pass it when mod_rewrite is off
 
 			$index_file = $this->getIndexFile($prefix, $index_file, $params);
 			$url = $index_file . '?' . $this->plain->build($t, $params, $pass, $pass_events);
 		}
 
 		if ( $prefix ) {
 			$prefix = trim($prefix, '/') . '/';
 		}
 
 		return $this->Application->BaseURL($domain, $ssl) . $prefix . $url . $map_link;
 	}
 
 	/**
 	 * Returns popup's parent window url and optionally removes it from opener stack
 	 *
 	 * @param string $prefix
 	 * @param Array $params
 	 * @return bool|string
 	 * @access protected
 	 */
 	protected function processPopupClose($prefix = '', $params = Array ())
 	{
+		/** @var kOpenerStack $opener_stack */
 		$opener_stack = $this->Application->makeClass('kOpenerStack');
-		/* @var $opener_stack kOpenerStack */
 
 		if ( $opener_stack->isEmpty() ) {
 			return false;
 		}
 
 		$ssl = isset($params['__SSL__']) ? $params['__SSL__'] : null;
 		list($index_file, $env) = explode('|', $opener_stack->get(kOpenerStack::LAST_ELEMENT, true));
 
 		if ( $prefix ) {
 			$prefix = trim($prefix, '/') . '/';
 		}
 
 		$ret = $this->Application->BaseURL('', $ssl) . $prefix . $index_file . '?' . ENV_VAR_NAME . '=' . $env;
 
 		if ( isset($params['m_opener']) && $params['m_opener'] == 'u' ) {
 			$opener_stack->pop();
 			$opener_stack->save(true);
 
 			if ( $opener_stack->isEmpty() ) {
 				// remove popups last templates, because popup is closing now
 				$this->Application->RemoveVar('last_template_' . $opener_stack->getWindowID());
 				$this->Application->RemoveVar('last_template_popup_' . $opener_stack->getWindowID());
 
 				// don't save popups last templates again :)
 				$this->Application->SetVar('skip_last_template', 1);
 			}
 
 			// store window relations
 			/*$window_relations = $this->Application->RecallVar('window_relations');
 			$window_relations = $window_relations ? unserialize($window_relations) : Array ();
 			if (array_key_exists($wid, $window_relations)) {
 				unset($window_relations[$wid]);
 				$this->Application->StoreVar('window_relations', serialize($window_relations));
 			}*/
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Returns variables with values that should be passed through with this link + variable list
 	 *
 	 * @param Array $params
 	 * @return Array
 	 * @access public
 	 */
 	public function getPassThroughVariables(&$params)
 	{
 		static $cached_pass_through = null;
 
 		if ( isset($params['no_pass_through']) && $params['no_pass_through'] ) {
 			unset($params['no_pass_through']);
 
 			return Array ();
 		}
 
 		// because pass through is not changed during script run, then we can cache it
 		if ( is_null($cached_pass_through) ) {
 			$cached_pass_through = Array ();
 			$pass_through = $this->Application->GetVar('pass_through');
 
 			if ( $pass_through ) {
 				// names of variables to pass to each link
 				$cached_pass_through['pass_through'] = $pass_through;
 				$pass_through = explode(',', $pass_through);
 
 				foreach ($pass_through as $pass_through_var) {
 					$cached_pass_through[$pass_through_var] = $this->Application->GetVar($pass_through_var);
 				}
 			}
 		}
 
 		return $cached_pass_through;
 	}
 
 	/**
 	 * Returns index file, that could be passed as parameter to method, as parameter to tag and as constant or not passed at all
 	 *
 	 * @param string $prefix
 	 * @param string $index_file
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function getIndexFile($prefix, $index_file = null, &$params)
 	{
 		static $cache = Array ();
 
 		if ( isset($params['index_file']) ) {
 			$index_file = $params['index_file'];
 			unset($params['index_file']);
 
 			return $index_file;
 		}
 
 		if ( isset($index_file) ) {
 			return $index_file;
 		}
 
 		if ( defined('INDEX_FILE') ) {
 			return INDEX_FILE;
 		}
 
 		// detect index file only once for given script and $cut_prefix
 		$php_self = $_SERVER['PHP_SELF'];
 		$cut_prefix = BASE_PATH . '/' . trim($prefix, '/');
 
 		if ( isset($cache[$php_self . ':' . $cut_prefix]) ) {
 			return $cache[$php_self . ':' . $cut_prefix];
 		}
 
 		$cache[$php_self . ':' . $cut_prefix] = trim(preg_replace('/' . preg_quote($cut_prefix, '/') . '(.*)/', '\\1', $php_self), '/');
 
 		return $cache[$php_self . ':' . $cut_prefix];
 	}
 
 	/**
 	 * Returns theme template filename and it's corresponding page_id based on given seo template
 	 *
 	 * @param string $seo_template
 	 * @return string
 	 * @access public
 	 */
 	public function getPhysicalTemplate($seo_template)
 	{
 		$physical_template = false;
 		$found_templates = array_keys($this->structureTemplateMapping, $seo_template);
 
 		foreach ($found_templates as $found_template) {
 			if ( substr($found_template, 0, 3) == 'id:' ) {
 				// exclude virtual templates
 				continue;
 			}
 
 			// several templates matched (physical and sym-linked to it)
 			$physical_template = $found_template;
 		}
 
 		if ( $physical_template === false ) {
 			// physical template from ".smsignore" file
 			return $seo_template;
 		}
 
 		list ($physical_template,) = explode(':', $physical_template, 2); // template_path:theme_id => seo_template
 
 		return $physical_template;
 	}
 
 	/**
 	 * Returns seo template by physical template
 	 *
 	 * @param string $physical_template
 	 * @return string
 	 * @access public
 	 */
 	public function getSeoTemplate($physical_template)
 	{
 		$mapping_key = $physical_template . ':' . $this->Application->GetVar('m_theme');
 
 		return isset($this->structureTemplateMapping[$mapping_key]) ? $this->structureTemplateMapping[$mapping_key] : '';
 	}
 
 	/**
 	 * Returns template name, that corresponds with given virtual (not physical) page id
 	 *
 	 * @param int $page_id
 	 * @return string|bool
 	 * @access public
 	 */
 	public function getVirtualPageTemplate($page_id)
 	{
 		return isset($this->structureTemplateMapping['id:' . $page_id]) ? $this->structureTemplateMapping['id:' . $page_id] : false;
 	}
 
 	/**
 	 * Returns section template for given physical/virtual template
 	 *
 	 * @param string $template
 	 * @param int $theme_id
 	 * @return string
 	 * @access public
 	 */
 	public function getSectionTemplate($template, $theme_id = null)
 	{
 		static $current_theme_id = null;
 
 		if ( !isset($current_theme_id) ) {
 			$current_theme_id = $this->Application->GetVar('m_theme');
 		}
 
 		if ( !isset($theme_id) ) {
 			$theme_id = $current_theme_id;
 		}
 
 		if ( array_key_exists($template . ':' . $theme_id, $this->structureTemplateMapping) ) {
 			// structure template corresponding to given physical template
 			return $this->structureTemplateMapping[$template . ':' . $theme_id];
 		}
 
 		return $template;
 	}
 
 	/**
 	 * Loads template mapping for Front-End
 	 *
 	 * @return void
 	 * @access public
 	 */
 	public function LoadStructureTemplateMapping()
 	{
 		if (!$this->Application->isAdmin) {
+			/** @var CategoryHelper $category_helper */
 			$category_helper = $this->Application->recallObject('CategoryHelper');
-			/* @var $category_helper CategoryHelper */
 
 			$this->structureTemplateMapping = $category_helper->getTemplateMapping();
 		}
 	}
 
 	/**
 	 * Removes tpl part from template name + resolved template ID to name
 	 *
 	 * @param string $default_template
 	 * @return string
 	 * @access public
 	 */
 	public function getTemplateName($default_template = '')
 	{
 		if ( $this->Application->GetVarDirect('t', 'Get') !== false ) {
 			// template name is passed directly in url (GET method)
 			$t = $this->Application->GetVarDirect('t', 'Get');
 		}
 		elseif ( $this->Application->GetVar('env') && $this->Application->RewriteURLs() && $this->Application->GetVar('t') ) {
 			// if t was set through env, even in mod_rewrite mode!
 			$t = $this->Application->GetVar('t');
 		}
 		else {
 			$t = trim($default_template ? $default_template : 'index', '/');
 		}
 
 		return trim(preg_replace('/\.tpl$/', '', $t), '/');
 	}
 
 	/**
 	 * Show 404 page and exit
 	 *
 	 * @return void
 	 * @access public
 	 */
 	public function show404()
 	{
 		header('HTTP/1.0 404 Not Found');
 
 		$not_found = $this->Application->ConfigValue('ErrorTemplate');
 		$template = $not_found ? $not_found : 'error_notfound';
 
 		$this->Application->QuickRun($template);
 		$this->Application->Done();
 		exit;
 	}
 }
Index: branches/5.3.x/core/kernel/managers/cache_manager.php
===================================================================
--- branches/5.3.x/core/kernel/managers/cache_manager.php	(revision 16518)
+++ branches/5.3.x/core/kernel/managers/cache_manager.php	(revision 16519)
@@ -1,853 +1,853 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class kCacheManager extends kBase implements kiCacheable {
 
 	/**
 	 * Used variables from SystemSettings table
 	 *
 	 * @var Array
 	 * @access protected
 	 */
 	protected $configVariables = Array();
 
 	/**
 	 * Used variables from SystemSettings table retrieved from unit cache
 	 *
 	 * @var Array
 	 * @access protected
 	 */
 	protected $originalConfigVariables = Array ();
 
 	/**
 	 * IDs of config variables used in current run (for caching)
 	 *
 	 * @var Array
 	 * @access protected
 	 */
 	protected $configIDs = Array ();
 
 	/**
 	 * IDs of config variables retrieved from unit cache
 	 *
 	 * @var Array
 	 * @access protected
 	 */
 	protected $originalConfigIDs = Array ();
 
 	/**
 	 * Object of memory caching class
 	 *
 	 * @var kCache
 	 * @access protected
 	 */
 	protected $cacheHandler = null;
 
 	protected $temporaryCache = Array (
 		'registerAggregateTag' => Array (),
 		'registerScheduledTask' => Array (),
 		'registerHook' => Array (),
 		'registerBuildEvent' => Array (),
 		'registerAggregateTag' => Array (),
 	);
 
 	/**
 	 * Name of database table, where configuration settings are stored
 	 *
 	 * @var string
 	 * @access protected
 	 */
 	protected $settingTableName = '';
 
 	/**
 	 * Set's references to kApplication and DBConnection interface class instances
 	 *
 	 * @access public
 	 */
 	public function __construct()
 	{
 		parent::__construct();
 
 		$this->settingTableName = TABLE_PREFIX . 'SystemSettings';
 
 		if ( defined('IS_INSTALL') && IS_INSTALL ) {
 			// table substitution required, so "root" can perform login to upgrade to 5.2.0, where setting table was renamed
 			if ( !$this->Application->TableFound(TABLE_PREFIX . 'SystemSettings') ) {
 				$this->settingTableName = TABLE_PREFIX . 'ConfigurationValues';
 			}
 		}
 	}
 	/**
 	 * Creates caching manager instance
 	 *
 	 * @access public
 	 */
 	public function InitCache()
 	{
 		$this->cacheHandler = $this->Application->makeClass('kCache');
 	}
 
 	/**
 	 * Returns cache key, used to cache phrase and configuration variable IDs used on current page
 	 *
 	 * @return string
 	 * @access protected
 	 */
 	protected function getCacheKey()
 	{
 		// TODO: maybe language part isn't required, since same phrase from different languages have one ID now
 		return $this->Application->GetVar('t') . $this->Application->GetVar('m_theme') . $this->Application->GetVar('m_lang') . $this->Application->isAdmin;
 	}
 
 	/**
 	 * Loads phrases and configuration variables, that were used on this template last time
 	 *
 	 * @access public
 	 */
 	public function LoadApplicationCache()
 	{
 		$phrase_ids = $config_ids = Array ();
 
 		$sql = 'SELECT PhraseList, ConfigVariables
 				FROM ' . TABLE_PREFIX . 'PhraseCache
 				WHERE Template = ' . $this->Conn->qstr( md5($this->getCacheKey()) );
 		$res = $this->Conn->GetRow($sql);
 
 		if ($res) {
 			if ( $res['PhraseList'] ) {
 				$phrase_ids = explode(',', $res['PhraseList']);
 			}
 
 			if ( $res['ConfigVariables'] ) {
 				$config_ids = array_diff( explode(',', $res['ConfigVariables']), $this->originalConfigIDs);
 			}
 		}
 
 		$this->Application->Phrases->Init('phrases', '', null, $phrase_ids);
 		$this->configIDs = $this->originalConfigIDs = $config_ids;
 
 		$this->InitConfig();
 	}
 
 	/**
 	 * Updates phrases and configuration variables, that were used on this template
 	 *
 	 * @access public
 	 */
 	public function UpdateApplicationCache()
 	{
 		$update = false;
 
 		//something changed
 		$update = $update || $this->Application->Phrases->NeedsCacheUpdate();
 		$update = $update || (count($this->configIDs) && $this->configIDs != $this->originalConfigIDs);
 
 		if ($update) {
 			$fields_hash = Array (
 				'PhraseList' => implode(',', $this->Application->Phrases->Ids),
 				'CacheDate' => time(),
 				'Template' => md5( $this->getCacheKey() ),
 				'ConfigVariables' => implode(',', array_unique($this->configIDs)),
 			);
 
 			$this->Conn->doInsert($fields_hash, TABLE_PREFIX . 'PhraseCache', 'REPLACE');
 		}
 	}
 
 	/**
 	 * Loads configuration variables, that were used on this template last time
 	 *
 	 * @access protected
 	 */
 	protected function InitConfig()
 	{
 		if (!$this->originalConfigIDs) {
 			return ;
 		}
 
 		$sql = 'SELECT VariableValue, VariableName
 				FROM ' . $this->settingTableName . '
 			 	WHERE VariableId IN (' . implode(',', $this->originalConfigIDs) . ')';
 		$config_variables = $this->Conn->GetCol($sql, 'VariableName');
 
 		$this->configVariables = array_merge($this->configVariables, $config_variables);
 	}
 
 	/**
 	 * Returns configuration option value by name
 	 *
 	 * @param string $name
 	 * @return string
 	 * @access public
 	 */
 	public function ConfigValue($name)
 	{
 		$site_domain_override = Array (
 			'DefaultEmailSender' => 'AdminEmail',
 			'DefaultEmailRecipients' => 'DefaultEmailRecipients',
 		);
 
 		if ( isset($site_domain_override[$name]) ) {
 			$res = $this->Application->siteDomainField($site_domain_override[$name]);
 
 			if ( $res ) {
 				return $res;
 			}
 		}
 
 		if ( array_key_exists($name, $this->configVariables) ) {
 			return $this->configVariables[$name];
 		}
 
 		if ( defined('IS_INSTALL') && IS_INSTALL && !$this->Application->TableFound($this->settingTableName, true) ) {
 			return false;
 		}
 
 		$this->Conn->nextQueryCachable = true;
 		$sql = 'SELECT VariableId, VariableValue
 				FROM ' . $this->settingTableName . '
 				WHERE VariableName = ' . $this->Conn->qstr($name);
 		$res = $this->Conn->GetRow($sql);
 
 		if ( $res !== false ) {
 			$this->configIDs[] = $res['VariableId'];
 			$this->configVariables[$name] = $res['VariableValue'];
 
 			return $res['VariableValue'];
 		}
 
 		trigger_error('Usage of undefined configuration variable "<strong>' . $name . '</strong>"', E_USER_NOTICE);
 
 		return false;
 	}
 
 	/**
 	 * Changes value of individual configuration variable (+resets cache, when needed)
 	 *
 	 * @param string $name
 	 * @param string $value
 	 * @param bool $local_cache_only
 	 * @return string
 	 * @access public
 	 */
 	public function SetConfigValue($name, $value, $local_cache_only = false)
 	{
 		$this->configVariables[$name] = $value;
 
 		if ( $local_cache_only ) {
 			return;
 		}
 
 		$fields_hash = Array ('VariableValue' => $value);
 		$this->Conn->doUpdate($fields_hash, $this->settingTableName, 'VariableName = ' . $this->Conn->qstr($name));
 
 		if ( array_key_exists($name, $this->originalConfigVariables) && $value != $this->originalConfigVariables[$name] ) {
 			$this->DeleteUnitCache();
 		}
 	}
 
 	/**
 	 * Loads data, that was cached during unit config parsing
 	 *
 	 * @return bool
 	 * @access public
 	 */
 	public function LoadUnitCache()
 	{
 		if ( $this->Application->isCachingType(CACHING_TYPE_MEMORY) ) {
 			$data = $this->Application->getCache('master:configs_parsed', false, CacheSettings::$unitCacheRebuildTime);
 		}
 		else {
 			$data = $this->Application->getDBCache('configs_parsed', CacheSettings::$unitCacheRebuildTime);
 		}
 
 		if ( $data ) {
 			$cache = unserialize($data); // 126 KB all modules
 			unset($data);
 
 			$this->Application->InitManagers();
 
 			$this->Application->setFromCache($cache);
 
+			/** @var kArray $aggregator */
 			$aggregator = $this->Application->recallObject('TagsAggregator', 'kArray');
-			/* @var $aggregator kArray */
 
 			$aggregator->setFromCache($cache);
 			$this->setFromCache($cache);
 			unset($cache);
 
 			return true;
 		}
 
 		return false;
 	}
 
 	/**
 	 * Empties factory and event manager cache (without storing changes)
 	 */
 	public function EmptyUnitCache()
 	{
 		// maybe discover keys automatically from corresponding classes
 		$cache_keys = Array (
 			'Factory.Files', 'Factory.ClassInfo', 'Factory.ClassTree', 'Factory.Namespaces', 'Factory.realClasses',
 			'ConfigReader.prefixFiles', 'ConfigCloner.clones',
 			'EventManager.beforeHooks', 'EventManager.afterHooks', 'EventManager.scheduledTasks', 'EventManager.buildEvents',
 			'Application.ReplacementTemplates', 'Application.Routers', 'Application.ModuleInfo',
 			'Application.ConfigHash', 'Application.ConfigCacheIds',
 		);
 
 		$empty_cache = Array ();
 
 		foreach ($cache_keys as $cache_key) {
 			$empty_cache[$cache_key] = Array ();
 		}
 
 		$this->Application->setFromCache($empty_cache);
 		$this->setFromCache($empty_cache);
 
 		// Otherwise kModulesHelper indirectly used from includeConfigFiles won't work.
 		$this->Application->RegisterDefaultClasses();
 		$this->Application->RegisterDefaultBuildEvents();
 	}
 
 	/**
 	 * Updates data, that was parsed from unit configs this time
 	 *
 	 * @access public
 	 */
 	public function UpdateUnitCache()
 	{
+		/** @var kArray $aggregator */
 		$aggregator = $this->Application->recallObject('TagsAggregator', 'kArray');
-		/* @var $aggregator kArray */
 
 		$this->preloadConfigVars(); // preloading will put to cache
 
 		$cache = array_merge(
 			$this->Application->getToCache(),
 			$aggregator->getToCache(),
 			$this->getToCache()
 		);
 
 		$cache_rebuild_by = SERVER_NAME . ' (' . $this->Application->getClientIp() . ') - ' . date('d/m/Y H:i:s');
 
 		if ($this->Application->isCachingType(CACHING_TYPE_MEMORY)) {
 			$this->Application->setCache('master:configs_parsed', serialize($cache));
 			$this->Application->setCache('master:last_cache_rebuild', $cache_rebuild_by);
 		}
 		else {
 			$this->Application->setDBCache('configs_parsed', serialize($cache));
 			$this->Application->setDBCache('last_cache_rebuild', $cache_rebuild_by);
 		}
 	}
 
 	public function delayUnitProcessing($method, $params)
 	{
 		if ($this->Application->InitDone) {
 			// init already done -> call immediately (happens during installation)
 			$function = Array (&$this->Application, $method);
 			call_user_func_array($function, $params);
 
 			return ;
 		}
 
 		$this->temporaryCache[$method][] = $params;
 	}
 
 	public function applyDelayedUnitProcessing()
 	{
 		foreach ($this->temporaryCache as $method => $method_calls) {
 			$function = Array (&$this->Application, $method);
 
 			foreach ($method_calls as $method_call) {
 				call_user_func_array($function, $method_call);
 			}
 
 			$this->temporaryCache[$method] = Array ();
 		}
 	}
 
 	/**
 	 * Deletes all data, that was cached during unit config parsing (excluding unit config locations)
 	 *
 	 * @param Array $config_variables
 	 * @access public
 	 */
 	public function DeleteUnitCache($config_variables = null)
 	{
 		if ( isset($config_variables) && !array_intersect(array_keys($this->originalConfigVariables), $config_variables) ) {
 			// prevent cache reset, when given config variables are not in unit cache
 			return;
 		}
 
 		if ( $this->Application->isCachingType(CACHING_TYPE_MEMORY) ) {
 			$this->Application->rebuildCache('master:configs_parsed', kCache::REBUILD_LATER, CacheSettings::$unitCacheRebuildTime);
 		}
 		else {
 			$this->rebuildDBCache('configs_parsed', kCache::REBUILD_LATER, CacheSettings::$unitCacheRebuildTime);
 		}
 	}
 
 	/**
 	 * Deletes cached section tree, used during permission checking and admin console tree display
 	 *
 	 * @return void
 	 * @access public
 	 */
 	public function DeleteSectionCache()
 	{
 		if ( $this->Application->isCachingType(CACHING_TYPE_MEMORY) ) {
 			$this->Application->rebuildCache('master:sections_parsed', kCache::REBUILD_LATER, CacheSettings::$sectionsParsedRebuildTime);
 		}
 		else {
 			$this->rebuildDBCache('sections_parsed', kCache::REBUILD_LATER, CacheSettings::$sectionsParsedRebuildTime);
 		}
 	}
 
 	/**
 	 * Preloads 21 widely used configuration variables, so they will get to cache for sure
 	 *
 	 * @access protected
 	 */
 	protected function preloadConfigVars()
 	{
 		$config_vars = Array (
 			// session related
 			'SessionTimeout', 'SessionCookieName', 'SessionCookieDomains', 'SessionBrowserSignatureCheck',
 			'SessionIPAddressCheck', 'CookieSessions', 'KeepSessionOnBrowserClose', 'User_GuestGroup',
 			'User_LoggedInGroup', 'RegistrationUsernameRequired',
 
 			// output related
 			'UseModRewrite', 'UseContentLanguageNegotiation', 'UseOutputCompression', 'OutputCompressionLevel',
 			'Config_Site_Time', 'SystemTagCache', 'DefaultGridPerPage',
 
 			// tracking related
 			'UseChangeLog', 'UseVisitorTracking', 'ModRewriteUrlEnding', 'ForceModRewriteUrlEnding',
 			'RunScheduledTasksFromCron',
 		);
 
 		$escaped_config_vars = $this->Conn->qstrArray($config_vars);
 
 		$sql = 'SELECT VariableId, VariableName, VariableValue
 				FROM ' . $this->settingTableName . '
 				WHERE VariableName IN (' . implode(',', $escaped_config_vars) . ')';
 		$data = $this->Conn->Query($sql, 'VariableId');
 
 		foreach ($data as $variable_id => $variable_info) {
 			$this->configIDs[] = $variable_id;
 			$this->configVariables[ $variable_info['VariableName'] ] = $variable_info['VariableValue'];
 		}
 	}
 
 	/**
 	 * Sets data from cache to object
 	 *
 	 * Used for cases, when ConfigValue is called before LoadApplicationCache method (e.g. session init, url engine init)
 	 *
 	 * @param Array $data
 	 * @access public
 	 */
 	public function setFromCache(&$data)
 	{
 		$this->configVariables = $this->originalConfigVariables = $data['Application.ConfigHash'];
 		$this->configIDs = $this->originalConfigIDs = $data['Application.ConfigCacheIds'];
 	}
 
 	/**
 	 * Gets object data for caching
 	 * The following caches should be reset based on admin interaction (adjusting config, enabling modules etc)
 	 *
 	 * @access public
 	 * @return Array
 	 */
 	public function getToCache()
 	{
 		return Array (
 			'Application.ConfigHash' => $this->configVariables,
 			'Application.ConfigCacheIds' => $this->configIDs,
 
 			// not in use, since it only represents template specific values, not global ones
 			// 'Application.Caches.ConfigVariables' => $this->originalConfigIDs,
 		);
 	}
 
 	/**
 	 * Returns caching type (none, memory, temporary)
 	 *
 	 * @param int $caching_type
 	 * @return bool
 	 * @access public
 	 */
 	public function isCachingType($caching_type)
 	{
 		return $this->cacheHandler->getCachingType() == $caching_type;
 	}
 
 	/**
 	 * Returns cached $key value from cache named $cache_name
 	 *
 	 * @param int $key key name from cache
 	 * @param bool $store_locally store data locally after retrieved
 	 * @param int $max_rebuild_seconds
 	 * @return mixed
 	 * @access public
 	 */
 	public function getCache($key, $store_locally = true, $max_rebuild_seconds = 0)
 	{
 		return $this->cacheHandler->getCache($key, $store_locally, $max_rebuild_seconds);
 	}
 
 	/**
 	 * Stores new $value in cache with $key name
 	 *
 	 * @param int $key key name to add to cache
 	 * @param mixed $value value of cached record
 	 * @param int $expiration when value expires (0 - doesn't expire)
 	 * @return bool
 	 * @access public
 	 */
 	public function setCache($key, $value, $expiration = 0)
 	{
 		return $this->cacheHandler->setCache($key, $value, $expiration);
 	}
 
 	/**
 	 * Stores new $value in cache with $key name (only if not there already)
 	 *
 	 * @param int $key key name to add to cache
 	 * @param mixed $value value of cached record
 	 * @param int $expiration when value expires (0 - doesn't expire)
 	 * @return bool
 	 * @access public
 	 */
 	public function addCache($key, $value, $expiration = 0)
 	{
 		return $this->cacheHandler->addCache($key, $value, $expiration);
 	}
 
 	/**
 	 * Sets rebuilding mode for given cache
 	 *
 	 * @param string $name
 	 * @param int $mode
 	 * @param int $max_rebuilding_time
 	 * @return bool
 	 * @access public
 	 */
 	public function rebuildCache($name, $mode = null, $max_rebuilding_time = 0)
 	{
 		return $this->cacheHandler->rebuildCache($name, $mode, $max_rebuilding_time);
 	}
 
 	/**
 	 * Deletes key from cache
 	 *
 	 * @param string $key
 	 * @return void
 	 * @access public
 	 */
 	public function deleteCache($key)
 	{
 		$this->cacheHandler->delete($key);
 	}
 
 	/**
 	 * Reset's all memory cache at once
 	 *
 	 * @return void
 	 * @access public
 	 */
 	public function resetCache()
 	{
 		$this->cacheHandler->reset();
 	}
 
 	/**
 	 * Returns value from database cache
 	 *
 	 * @param string $name key name
 	 * @param int $max_rebuild_seconds
 	 * @return mixed
 	 * @access public
 	 */
 	public function getDBCache($name, $max_rebuild_seconds = 0)
 	{
 		// no serials in cache key OR cache is outdated
 		$rebuilding = false;
 		$wait_seconds = $max_rebuild_seconds;
 
 		while (true) {
 			$cached_data = $this->_getDBCache(Array ($name, $name . '_rebuilding', $name . '_rebuild'));
 
 			if ( $cached_data[$name . '_rebuild'] ) {
 				// cache rebuild requested -> rebuild now
 				$this->deleteDBCache($name . '_rebuild');
 
 				if ( $this->rebuildDBCache($name, kCache::REBUILD_NOW, $max_rebuild_seconds, '[M1]') ) {
 					return false;
 				}
 			}
 
 			$cache = $cached_data[$name];
 			$rebuilding = $cached_data[$name . '_rebuilding'];
 
 			if ( ($cache === false) && (!$rebuilding || $wait_seconds == 0) ) {
 				// cache missing and nobody rebuilding it -> rebuild; enough waiting for cache to be ready
 				$this->rebuildDBCache($name, kCache::REBUILD_NOW, $max_rebuild_seconds, '[M2' . ($rebuilding ? 'R' : '!R') . ',WS=' . $wait_seconds . ']');
 
 				return false;
 			}
 			elseif ( $cache !== false ) {
 				// cache present -> return it
 				$this->cacheHandler->storeStatistics($name, $rebuilding ? 'h' : 'H');
 
 				return $cache;
 			}
 
 			$wait_seconds -= kCache::WAIT_STEP;
 			sleep(kCache::WAIT_STEP);
 		}
 
 		$this->rebuildDBCache($name, kCache::REBUILD_NOW, $max_rebuild_seconds, '[M3' . ($rebuilding ? 'R' : '!R') . ',WS=' . $wait_seconds . ']');
 
 		return false;
 	}
 
 	/**
 	 * Returns value from database cache
 	 *
 	 * @param string|Array $names key name
 	 * @return mixed
 	 * @access protected
 	 */
 	protected function _getDBCache($names)
 	{
 		$res = Array ();
 		$names = (array)$names;
 		$this->Conn->nextQueryCachable = true;
 
 		$sql = 'SELECT Data, Cached, LifeTime, VarName
 				FROM ' . TABLE_PREFIX . 'SystemCache
 				WHERE VarName IN (' . implode(',', $this->Conn->qstrArray($names)) . ')';
 		$cached_data = $this->Conn->Query($sql, 'VarName');
 
 		foreach ($names as $name) {
 			if ( !isset($cached_data[$name]) ) {
 				$res[$name] = false;
 				continue;
 			}
 
 			$lifetime = (int)$cached_data[$name]['LifeTime']; // in seconds
 
 			if ( ($lifetime > 0) && ($cached_data[$name]['Cached'] + $lifetime < time()) ) {
 				// delete expired
 				$this->Conn->nextQueryCachable = true;
 
 				$sql = 'DELETE FROM ' . TABLE_PREFIX . 'SystemCache
 						WHERE VarName = ' . $this->Conn->qstr($name);
 				$this->Conn->Query($sql);
 
 				$res[$name] = false;
 				continue;
 			}
 
 			$res[$name] = $cached_data[$name]['Data'];
 		}
 
 		return count($res) == 1 ? array_pop($res) : $res;
 	}
 
 	/**
 	 * Sets value to database cache
 	 *
 	 * @param string $name
 	 * @param mixed $value
 	 * @param int|bool $expiration
 	 * @return void
 	 * @access public
 	 */
 	public function setDBCache($name, $value, $expiration = false)
 	{
 		$this->cacheHandler->storeStatistics($name, 'WU');
 
 		$this->deleteDBCache($name . '_rebuilding');
 		$this->_setDBCache($name, $value, $expiration);
 	}
 
 	/**
 	 * Sets value to database cache
 	 *
 	 * @param string $name
 	 * @param mixed $value
 	 * @param int|bool $expiration
 	 * @param string $insert_type
 	 * @return bool
 	 * @access protected
 	 */
 	protected function _setDBCache($name, $value, $expiration = false, $insert_type = 'REPLACE')
 	{
 		if ( (int)$expiration <= 0 ) {
 			$expiration = -1;
 		}
 
 		$fields_hash = Array (
 			'VarName' => $name,
 			'Data' => &$value,
 			'Cached' => time(),
 			'LifeTime' => (int)$expiration,
 		);
 
 		$this->Conn->nextQueryCachable = true;
 
 		return $this->Conn->doInsert($fields_hash, TABLE_PREFIX . 'SystemCache', $insert_type);
 	}
 
 	/**
 	 * Sets value to database cache
 	 *
 	 * @param string $name
 	 * @param mixed $value
 	 * @param int|bool $expiration
 	 * @return bool
 	 * @access protected
 	 */
 	protected function _addDBCache($name, $value, $expiration = false)
 	{
 		return $this->_setDBCache($name, $value, $expiration, 'INSERT');
 	}
 
 	/**
 	 * Sets rebuilding mode for given cache
 	 *
 	 * @param string $name
 	 * @param int $mode
 	 * @param int $max_rebuilding_time
 	 * @param string $miss_type
 	 * @return bool
 	 * @access public
 	 */
 	public function rebuildDBCache($name, $mode = null, $max_rebuilding_time = 0, $miss_type = 'M')
 	{
 		if ( !isset($mode) || $mode == kCache::REBUILD_NOW ) {
 			$this->cacheHandler->storeStatistics($name, $miss_type);
 
 			if ( !$max_rebuilding_time ) {
 				return true;
 			}
 
 			if ( !$this->_addDBCache($name . '_rebuilding', 1, $max_rebuilding_time) ) {
 				$this->cacheHandler->storeStatistics($name, 'l');
 
 				return false;
 			}
 
 			$this->deleteDBCache($name . '_rebuild');
 			$this->cacheHandler->storeStatistics($name, 'L');
 		}
 		elseif ( $mode == kCache::REBUILD_LATER ) {
 			$this->_setDBCache($name . '_rebuild', 1, 0);
 			$this->deleteDBCache($name . '_rebuilding');
 		}
 
 		return true;
 	}
 
 	/**
 	 * Deletes key from database cache
 	 *
 	 * @param string $name
 	 * @return void
 	 * @access public
 	 */
 	public function deleteDBCache($name)
 	{
 		$sql = 'DELETE FROM ' . TABLE_PREFIX . 'SystemCache
 				WHERE VarName = ' . $this->Conn->qstr($name);
 		$this->Conn->Query($sql);
 	}
 
 	/**
 	 * Increments serial based on prefix and it's ID (optional)
 	 *
 	 * @param string $prefix
 	 * @param int $id ID (value of IDField) or ForeignKeyField:ID
 	 * @param bool $increment
 	 * @return string
 	 * @access public
 	 */
 	public function incrementCacheSerial($prefix, $id = null, $increment = true)
 	{
 		$pascal_case_prefix = implode('', array_map('ucfirst', explode('-', $prefix)));
 		$serial_name = $pascal_case_prefix . (isset($id) ? 'IDSerial:' . $id : 'Serial');
 
 		if ($increment) {
 			if (defined('DEBUG_MODE') && DEBUG_MODE && $this->Application->isDebugMode()) {
 				$this->Application->Debugger->appendHTML('Incrementing serial: <strong>' . $serial_name . '</strong>.');
 			}
 
 			$this->setCache($serial_name, (int)$this->getCache($serial_name) + 1);
 
 			if (!defined('IS_INSTALL') || !IS_INSTALL) {
 				// delete cached mod-rewrite urls related to given prefix and id
 				$delete_clause = isset($id) ? $prefix . ':' . $id : $prefix;
 
 				$sql = 'DELETE FROM ' . TABLE_PREFIX . 'CachedUrls
 						WHERE Prefixes LIKE ' . $this->Conn->qstr('%|' . $delete_clause . '|%');
 				$this->Conn->Query($sql);
 			}
 		}
 
 		return $serial_name;
 	}
 
 	/**
 	 * Returns cached category informaton by given cache name. All given category
 	 * information is recached, when at least one of 4 caches is missing.
 	 *
 	 * @param int $category_id
 	 * @param string $name cache name = {filenames, category_designs, category_tree}
 	 * @return string
 	 * @access public
 	 */
 	public function getCategoryCache($category_id, $name)
 	{
 		$serial_name = '[%CIDSerial:' . $category_id . '%]';
 		$cache_key = $name . $serial_name;
 		$ret = $this->getCache($cache_key);
 
 		if ($ret === false) {
 			if (!$category_id) {
 				// don't query database for "Home" category (ID = 0), because it doesn't exist in database
 				return false;
 			}
 
 			// this allows to save 2 sql queries for each category
 			$this->Conn->nextQueryCachable = true;
 			$sql = 'SELECT NamedParentPath, CachedTemplate, TreeLeft, TreeRight
 					FROM ' . TABLE_PREFIX . 'Categories
 					WHERE CategoryId = ' . (int)$category_id;
 			$category_data = $this->Conn->GetRow($sql);
 
 			if ($category_data !== false) {
 				// only direct links to category pages work (symlinks, container pages and so on won't work)
 				$this->setCache('filenames' . $serial_name,				$category_data['NamedParentPath']);
 				$this->setCache('category_designs' . $serial_name,		ltrim($category_data['CachedTemplate'], '/'));
 				$this->setCache('category_tree' . $serial_name,			$category_data['TreeLeft'] . ';' . $category_data['TreeRight']);
 			}
 		}
 
 		return $this->getCache($cache_key);
 	}
 }
Index: branches/5.3.x/core/kernel/managers/subscription_manager.php
===================================================================
--- branches/5.3.x/core/kernel/managers/subscription_manager.php	(revision 16518)
+++ branches/5.3.x/core/kernel/managers/subscription_manager.php	(revision 16519)
@@ -1,204 +1,204 @@
 <?php
 /**
  * @version	$Id$
  * @package	In-Portal
  * @copyright	Copyright (C) 1997 - 2012 Intechnic. All rights reserved.
  * @license	  GNU/GPL
  * In-Portal is Open Source software.
  * This means that this software may have been modified pursuant
  * the GNU General Public License, and as distributed it includes
  * or is derivative of works licensed under the GNU General Public License
  * or other free or open source software licenses.
  * See http://www.in-portal.org/license for copyright notices and details.
  */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class kSubscriptionManager extends kBase {
 
 	/**
 	 * List of subscriptions (instances of kSubscriptionItem objects)
 	 *
 	 * @var kSubscriptionItem[]
 	 * @access protected
 	 */
 	protected $subscriptions = Array ();
 
 	/**
 	 * Adds set of fields, that uniquely identifies subscription
 	 *
 	 * @param Array $fields
 	 * @return void
 	 */
 	public function add($fields)
 	{
 		$this->subscriptions[] = new kSubscriptionItem($fields);
 	}
 
 	/**
 	 * Detects if current user is subscribed to new posts in given topic
 	 *
 	 * @return bool
 	 * @access public
 	 */
 	public function subscribed()
 	{
 		foreach ($this->subscriptions as $subscription) {
 			if ( !$subscription->getSubscription()->isLoaded() ) {
-				/* @var $subscription kSubscriptionItem */
+				/** @var kSubscriptionItem $subscription */
 
 				return false;
 			}
 		}
 
 		return true;
 	}
 
 	/**
 	 * Subscribes current user to new posts in a given topic
 	 *
 	 * @return bool
 	 * @access public
 	 */
 	public function subscribe()
 	{
 		foreach ($this->subscriptions as $subscription) {
 			if ( !$subscription->subscribe() ) {
-				/* @var $subscription kSubscriptionItem */
+				/** @var kSubscriptionItem $subscription */
 
 				return false;
 			}
 		}
 
 		return true;
 	}
 
 	/**
 	 * Unsubscribes current user from reciving e-mails about new posts in a gvein topic
 	 *
 	 * @return bool
 	 * @access public
 	 */
 	public function unsubscribe()
 	{
 		foreach ($this->subscriptions as $subscription) {
 			if ( !$subscription->unsubscribe() ) {
-				/* @var $subscription kSubscriptionItem */
+				/** @var kSubscriptionItem $subscription */
 
 				return false;
 			}
 		}
 
 		return true;
 	}
 
 	/**
 	 * Returns e-mail event id or throws an exception, when such event not found
 	 *
 	 * @param string $template_name
 	 * @param int $type
 	 * @return string
 	 * @throws Exception
 	 * @access public
 	 */
 	public function getEmailTemplateId($template_name, $type = EmailTemplate::TEMPLATE_TYPE_FRONTEND)
 	{
 		$sql = 'SELECT TemplateId
 				FROM ' . $this->Application->getUnitConfig('email-template')->getTableName() . '
 				WHERE TemplateName = ' . $this->Conn->qstr($template_name) . ' AND Type = ' . $type;
 		$id = $this->Conn->GetOne($sql);
 
 		if ( !$id ) {
 			throw new Exception('E-mail template "' . $template_name . '" not found');
 		}
 
 		return $id;
 	}
 }
 
 
 class kSubscriptionItem extends kBase {
 
 	/**
 	 * Fields set, that uniquely identifies subscription
 	 *
 	 * @var Array
 	 * @access protected
 	 */
 	protected $fields = Array ();
 
 	/**
 	 * Creates new subscription item
 	 *
 	 * @param Array $fields
 	 * @access public
 	 */
 	public function __construct($fields)
 	{
 		parent::__construct();
 
 		$this->fields = $fields;
 	}
 
 	/**
 	 * Returns user subscription
 	 *
 	 * @param bool $reload
 	 * @return kBase|kDBItem
 	 * @access public
 	 */
 	public function getSubscription($reload = false)
 	{
 		$special = kUtil::crc32(serialize($this->fields));
 
+		/** @var kDBItem $subscription */
 		$subscription = $this->Application->recallObject('system-event-subscription.' . $special, null, Array ('skip_autoload' => true));
-		/* @var $subscription kDBItem */
 
 		if ( !$subscription->isLoaded() || $reload ) {
 			$subscription->Load($this->fields);
 		}
 
 		return $subscription;
 	}
 
 	/**
 	 * Subscribes user
 	 *
 	 * @return bool
 	 * @access public
 	 */
 	public function subscribe()
 	{
 		$subscription = $this->getSubscription();
 
 		if ( $subscription->isLoaded() ) {
 			return true;
 		}
 
 		$subscription->SetDBFieldsFromHash($this->fields);
 
 		return $subscription->Create();
 	}
 
 	/**
 	 * Unsubscribes user
 	 *
 	 * @return bool
 	 * @access public
 	 */
 	public function unsubscribe()
 	{
 		$subscription = $this->getSubscription();
 
 		if ( !$subscription->isLoaded() ) {
 			return true;
 		}
 
+		/** @var kTempTablesHandler $temp_handler */
 		$temp_handler = $this->Application->recallObject($subscription->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler');
-		/* @var $temp_handler kTempTablesHandler */
 
 		$temp_handler->DeleteItems($subscription->Prefix, $subscription->Special, Array ($subscription->GetID()));
 
 		return true;
 	}
 }
\ No newline at end of file
Index: branches/5.3.x/core/kernel/managers/request_manager.php
===================================================================
--- branches/5.3.x/core/kernel/managers/request_manager.php	(revision 16518)
+++ branches/5.3.x/core/kernel/managers/request_manager.php	(revision 16519)
@@ -1,478 +1,478 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2010 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class kRequestManager extends kBase {
 
 	/**
 	 * Prevents request from being proceeded twice
 	 *
 	 * @var bool
 	 * @access protected
 	 */
 	protected $processed = false;
 
 	/**
 	 * Processes request
 	 *
 	 * @access public
 	 */
 	public function process()
 	{
 		if ( $this->processed ) {
 			return;
 		}
 
 		$this->dumpRequest();
 		$this->processOpener();
 
 		$events = $this->getEvents();
 		$all_passed = $this->getAllPassed($events);
 
 		// set "all_passed" before kApplication::GetTopmostPrefix method call !
 		$this->Application->SetVar('all_passed', implode(',', $all_passed));
 
 		foreach ($events as $prefix_special => $event_name) {
 			$event =& $this->runEvent($prefix_special, $event_name);
 
 			if ( $event->status == kEvent::erSTOP ) {
 				// event requested to stop processing at this point
 				kUtil::safeDefine('DBG_SKIP_REPORTING', 1);
 				$this->Application->Session->SaveData();
 				exit;
 			}
 
 			if ( $event->status == kEvent::erPERM_FAIL ) {
 				$this->processPermissionError($event);
 			}
 
 			if ( ($event->status == kEvent::erSUCCESS || $event->status == kEvent::erPERM_FAIL) && $this->canRedirect($event) ) {
 				$this->performRedirect($event);
 			}
 		}
 
 		$this->Application->SetVar('events', $events);
 		$this->Application->SetVar('passed', implode(',', $all_passed));
 
 		$this->processed = true;
 	}
 
 	/**
 	 * Dumps user request to debugger (only when enabled)
 	 *
 	 * @return void
 	 * @access protected
 	 */
 	protected function dumpRequest()
 	{
 		if ( defined('DEBUG_MODE') && $this->Application->isDebugMode() && kUtil::constOn('DBG_SHOW_HTTPQUERY') ) {
 			$this->Application->Debugger->appendHTML('HTTPQuery:');
 			$this->Application->Debugger->dumpVars($this->Application->HttpQuery->_Params);
 		}
 	}
 
 	/**
 	 * Returns event names, given in request (post, get)
 	 *
 	 * @return Array
 	 * @access protected
 	 */
 	protected function getEvents()
 	{
 		$post_events = $this->getEventsFromPost();
 
 		return $post_events ? $post_events : $this->getEventsFromGet();
 	}
 
 	/**
 	 * Get all passed prefixes
 	 *
 	 * @param Array $events
 	 * @return Array
 	 * @access protected
 	 */
 	protected function getAllPassed($events)
 	{
 		$ret = explode(',', $this->Application->GetVar('passed'));
 
 		foreach ($events as $prefix_special => $event_name) {
 			if (!$event_name) {
 				continue;
 			}
 
 			if ($this->Application->isAdmin) {
 				array_push($ret, $prefix_special);
 			}
 			else {
 				// don't add special on Front-end because of category item list special is autogenerated
 				$prefix_special = explode('.', $prefix_special);
 				array_push($ret, $prefix_special[0]);
 			}
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Creates and runs event. Returns false, when prefix of given event isn't registered
 	 *
 	 * @param string $prefix_special
 	 * @param string $event_name
 	 *
 	 * @return kEvent|false
 	 * @access protected
 	 */
 	protected function &runEvent($prefix_special, $event_name)
 	{
 		$event = new kEvent($prefix_special . ':' . $event_name);
 
 		if ( !$this->Application->EventManager->verifyEventPrefix($event, true) ) {
 			$false = false;
 
 			return $false;
 		}
 
 		$event->SetRedirectParam('opener', 's'); // stay on same page after event is called
 		$event->setEventParam('top_prefix', $this->Application->GetTopmostPrefix($event->Prefix, true));
 
+		/** @var kEventHandler $event_handler */
 		$event_handler = $this->Application->recallObject($event->Prefix . '_EventHandler');
-		/* @var $event_handler kEventHandler */
 
 		if ( ($this->Application->RecallVar('user_id') == USER_ROOT) || $event_handler->CheckPermission($event) ) {
 			$this->Application->HandleEvent($event);
 			$this->Application->notifyEventSubscribers($event);
 		}
 
 		return $event;
 	}
 
 	/**
 	 * Processes case, when event finished with permission error
 	 *
 	 * @param kEvent $event
 	 * @access protected
 	 */
 	protected function processPermissionError($event)
 	{
 		// should do redirect but to no_permissions template
 		$event->redirect = $this->Application->isAdmin ? 'no_permission' : $this->Application->ConfigValue('NoPermissionTemplate');
 		$event->SetRedirectParam('pass', 'm');
 
+		/** @var kThemesHelper $themes_helper */
 		$themes_helper = $this->Application->recallObject('ThemesHelper');
-		/* @var $themes_helper kThemesHelper */
 
 		$event->SetRedirectParam( 'm_cat_id', $themes_helper->getPageByTemplate($event->redirect) );
 
 		// restore stuff, that processOpener() changed
 		$wid = $this->Application->GetVar('m_wid');
 		$this->Application->RestoreVar( rtrim('opener_stack_' . $wid, '_') );
 
 		// don't save last_template, because no_permission template does js history.back and could cause invalid opener_stack content
 		$this->Application->SetVar('skip_last_template', 1);
 	}
 
 	/**
 	 * Performs redirect after event execution
 	 *
 	 * @param kEvent $event
 	 * @access protected
 	 */
 	protected function performRedirect($event)
 	{
 		// we need to pass category if the action was submitted to self-template, with the category passed
 		// and it has not explicitly set redirect template or pass_category param
 		if ( $this->samePageRedirect($event) && ($event->getEventParam('pass_category') === false) && $this->Application->GetVar('m_cat_id') ) {
 			$event->SetRedirectParam('pass_category', 1);
 		}
 
 		$wid = $this->Application->GetVar('m_wid');
 		$redirect_params = $event->getRedirectParams();
 
 		if ( $wid && $event->getRedirectParam('opener') == 'u' ) {
 			// update last element in current opener stack
 			unset($redirect_params['opener']);
 			$redirect_template = is_string($event->redirect) ? $event->redirect : null;
 			$this->openerStackChange($redirect_template, $redirect_params);
 
 			// reset opener, because kApplication::HREF will react differently when 'opener' => 'u'
 			$event->SetRedirectParam('opener', 's');
 			$event->redirect = defined('CLOSE_POPUP_TPL') ? CLOSE_POPUP_TPL : 'incs/close_popup';
 		}
 
 		if ( $event->getRedirectParam('pass') === false ) {
 			// pass all discovered units to redirected page unless developer decided otherwise
 			$event->SetRedirectParam('pass', 'all');
 		}
 
 		$this->Application->Redirect($event->redirect, $event->getRedirectParams(), '', $event->redirectScript);
 	}
 
 	/**
 	 * Checks, if redirect can be made
 	 *
 	 * @param kEvent $event
 	 * @return bool
 	 * @access protected
 	 */
 	protected function canRedirect($event)
 	{
 		return $this->samePageRedirect($event) || strlen($event->redirect) > 0;
 	}
 
 	/**
 	 * Checks, that current template will be displayed after redirect
 	 *
 	 * @param kEvent $event
 	 * @return bool
 	 * @access protected
 	 */
 	protected function samePageRedirect($event)
 	{
 		return $event->redirect === true || $event->redirect == $this->Application->GetVar('t');
 	}
 
 	/**
 	 * Returns event names given in GET
 	 *
 	 * @return Array
 	 * @access protected
 	 */
 	protected function getEventsFromGet()
 	{
 		$events = Array ();
 		$discovered_units = $this->Application->HttpQuery->getDiscoveredUnits(false);
 
 		foreach ($discovered_units as $prefix_special => $query_string) {
 			$query_string = array_flip($query_string);
 
 			if ( !isset($query_string['event']) ) {
 				continue;
 			}
 
 			$event_name = $this->Application->GetVar($prefix_special . '_event');
 
 			// we need to check for pre 5.1.0 url format, because of "PerPage"
 			// query string part (that was added in place of "event" query
 			// string part) is available only since 5.1.0 version
 			if ($event_name && !is_numeric($event_name)) {
 				$events[$prefix_special] = $event_name;
 			}
 		}
 
 		return $events;
 	}
 
 	/**
 	 * Returns event names given in POST
 	 *
 	 * @return Array
 	 * @access protected
 	 */
 	protected function getEventsFromPost()
 	{
 		$ret = Array ();
 		$events = $this->Application->GetVar('events');
 
 		if (!$events) {
 			return Array ();
 		}
 
 		foreach ($events as $prefix_special => $event_name) {
 			if (!$event_name) {
 				continue;
 			}
 
 			if ( is_array($event_name) ) {
 				// HTML-input names like "events[prefix.special][event_name]", input value don't matter
 				$event_name = key($event_name);
 				$this->Application->SetVar($prefix_special . '_event', $event_name);
 			}
 
 			// HTML-input names like "events[prefix.special]", input value is event name
 			$ret[$prefix_special] = $event_name;
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Processes window opener stack
 	 *
 	 * @access protected
 	 */
 	protected function processOpener()
 	{
+		/** @var kOpenerStack $opener_stack */
 		$opener_stack = $this->Application->makeClass('kOpenerStack');
-		/* @var $opener_stack kOpenerStack */
 
 		switch ( $this->Application->GetVar('m_opener') ) {
 			case 'r':
 				$opener_stack->reset();
 				break;
 
 			case 'd':
 				// "down/push" new template to opener stack, deeplevel++
 				if ( $this->Application->GetVar('front') ) {
+					/** @var Session $front_session */
 					$front_session = $this->Application->recallObject('Session.front');
-					/* @var $front_session Session */
 
 					$opener_stack->pushRaw( '../' . $front_session->RecallVar('last_template') );
 				}
 				else {
 					$opener_stack->pushRaw( $this->Application->RecallVar('last_template') );
 				}
 				break;
 
 			case 'u':
 				// "up/pop" last template from opener stack, deeplevel--
 				$opener_stack->pop();
 				break;
 
 			case 'p':
 				// pop-up - generate new wid
 				$parent_wid = $this->Application->GetVar('m_wid'); // window_id of popup's parent window
 				$popup_wid = (int)$this->Application->RecallVar('last_wid') + 1;
 				$this->Application->StoreVar('last_wid', $popup_wid);
 				$this->Application->SetVar('m_wid', $popup_wid);
 
+				/** @var kOpenerStack $popup_opener_stack */
 				$popup_opener_stack = $this->Application->makeClass('kOpenerStack', Array ($popup_wid));
-				/* @var $popup_opener_stack kOpenerStack */
 
 				$popup_opener_stack->pushRaw( $this->getLastTemplate($parent_wid) );
 				$popup_opener_stack->save();
 
 				$this->Application->SetVar('m_opener', 's');
 
 				/*// store window relations
 				$window_relations = $this->Application->RecallVar('window_relations');
 				$window_relations = $window_relations ? unserialize($window_relations) : Array ();
 				$window_relations[$popup_wid] = $parent_wid;
 				$this->Application->StoreVar('window_relations', serialize($window_relations));*/
 				return;
 				break;
 
 			default:
 				// "s/0," stay on same deep level
 				break;
 		}
 
 		$this->Application->SetVar('m_opener', 's');
 		$opener_stack->save();
 	}
 
 	/**
 	 * Returns last template from window with given id
 	 *
 	 * @param int $window_id
 	 * @return string
 	 * @access protected
 	 */
 	protected function getLastTemplate($window_id)
 	{
 		if ( $this->Application->GetVar('front') ) {
+			/** @var Session $front_session */
 			$front_session = $this->Application->recallObject('Session.front');
-			/* @var $front_session Session */
 
 			return '../' . $front_session->RecallVar( rtrim('last_template_popup_' . $window_id, '_') );
 		}
 
 		if ( $this->Application->GetVar('merge_opener_stack') ) {
 			// get last template from parent (that was closed) window opener stack
+			/** @var kOpenerStack $parent_opener_stack */
 			$parent_opener_stack = $this->Application->makeClass('kOpenerStack', Array ($window_id));
-			/* @var $parent_opener_stack kOpenerStack */
 
 			$last_template = $parent_opener_stack->pop(true);
 			$parent_opener_stack->save(true);
 		}
 		else {
 			$last_template = $this->Application->RecallVar( rtrim('last_template_popup_' . $window_id, '_') );
 		}
 
 		return $last_template;
 	}
 
 	/**
 	 * Allows to add new element to opener stack
 	 *
 	 * @param string $template
 	 * @param Array $params
 	 * @param int $wid
 	 * @access public
 	 */
 	public function openerStackPush($template = '', $params = Array (), $wid = null)
 	{
 		if ( !isset($params['pass']) ) {
 			$params['pass'] = 'all';
 		}
 
 		/*// get parent window wid, when this was popup
 		$window_relations = $this->Application->RecallVar('window_relations');
 		$window_relations = $window_relations ? unserialize($window_relations) : Array ();
 		$wid = isset($window_relations[$wid]) ? $window_relations[$wid] : false;*/
 
+		/** @var kOpenerStack $opener_stack */
 		$opener_stack = $this->Application->makeClass('kOpenerStack', Array ($wid));
-		/* @var $opener_stack kOpenerStack */
 
 		// change opener stack
 		$default_params = Array ('m_opener' => 'u');
 
 		if ( !$this->Application->ConfigValue('UsePopups') && $opener_stack->getWindowID() ) {
 			// remove wid to show combined header block in editing window
 			$default_params['m_wid'] = '';
 			list ($last_template, $last_params, ) = $opener_stack->get(kOpenerStack::LAST_ELEMENT);
 
 			// move last popup's opener stack element to main window's opener stack
 			if ( $last_params ) {
 				$last_params = array_merge($last_params, $default_params);
 				$this->openerStackPush($last_template, $last_params, '');
 			}
 		}
 
 		$params = array_merge($default_params, $params);
 		$opener_stack->push($template, $params, 'index.php');
 		$opener_stack->save();
 	}
 
 	/**
 	 * Allows to change last element in opener stack
 	 *
 	 * @param string $new_template
 	 * @param Array $new_params
 	 * @access protected
 	 */
 	protected function openerStackChange($new_template = null, $new_params = null)
 	{
+		/** @var kOpenerStack $opener_stack */
 		$opener_stack = $this->Application->makeClass('kOpenerStack');
-		/* @var $opener_stack kOpenerStack */
 
 		list ($template, $params, $index_file) = $opener_stack->pop();
 
 		if ( isset($new_template) ) {
 			$template = $new_template;
 		}
 
 		if ( isset($new_params) ) {
 			$params = array_merge($params, $new_params);
 		}
 
 		if ( !isset($params['pass_events']) ) {
 			// don't pass events, unless requested
 			$params['pass_events'] = false;
 		}
 
 		$opener_stack->push($template, $params, $index_file);
 		$opener_stack->save();
 	}
 }
\ No newline at end of file
Index: branches/5.3.x/core/kernel/managers/rewrite_url_processor.php
===================================================================
--- branches/5.3.x/core/kernel/managers/rewrite_url_processor.php	(revision 16518)
+++ branches/5.3.x/core/kernel/managers/rewrite_url_processor.php	(revision 16519)
@@ -1,1069 +1,1069 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class kRewriteUrlProcessor extends kUrlProcessor {
 
 	/**
 	 * Holds a reference to httpquery
 	 *
 	 * @var kHttpQuery
 	 * @access protected
 	 */
 	protected $HTTPQuery = null;
 
 	/**
 	 * Urls parts, that needs to be matched by routers.
 	 *
 	 * @var array
 	 */
 	protected $_partsToParse = array();
 
 	/**
 	 * Category item prefix, that was found
 	 *
 	 * @var string|boolean
 	 * @access protected
 	 */
 	protected $modulePrefix = false;
 
 	/**
 	 * Template aliases for current theme
 	 *
 	 * @var Array
 	 * @access protected
 	 */
 	protected $_templateAliases = null;
 
 	/**
 	 * Domain-based primary language id
 	 *
 	 * @var int
 	 * @access public
 	 */
 	public $primaryLanguageId = false;
 
 	/**
 	 * Domain-based primary theme id
 	 *
 	 * @var int
 	 * @access public
 	 */
 	public $primaryThemeId = false;
 
 	/**
 	 * Possible url endings from ModRewriteUrlEnding configuration variable
 	 *
 	 * @var Array
 	 * @access protected
 	 */
 	protected $_urlEndings = Array ('.html', '/', '');
 
 	/**
 	 * Factory storage sub-set, containing routers, used during url building and parsing.
 	 *
 	 * @var array
 	 */
 	protected $routers = array();
 
 	/**
 	 * Constructor of kRewriteUrlProcessor class
 	 *
 	 * @param $manager
 	 * @return kRewriteUrlProcessor
 	 */
 	public function __construct(&$manager)
 	{
 		parent::__construct($manager);
 
 		$this->HTTPQuery = $this->Application->recallObject('kHTTPQuery');
 
 		// domain based primary language
 		$this->primaryLanguageId = $this->Application->siteDomainField('PrimaryLanguageId');
 
 		if (!$this->primaryLanguageId) {
 			// when domain-based language not found -> use site-wide language
 			$this->primaryLanguageId = $this->Application->GetDefaultLanguageId();
 		}
 
 		// domain based primary theme
 		$this->primaryThemeId = $this->Application->siteDomainField('PrimaryThemeId');
 
 		if (!$this->primaryThemeId) {
 			// when domain-based theme not found -> use site-wide theme
 			$this->primaryThemeId = $this->Application->GetDefaultThemeId(true);
 		}
 
 		$this->initRouters();
 	}
 
 	/**
 	 * Sets module prefix.
 	 *
 	 * @param string $prefix Unit config prefix.
 	 *
 	 * @return void
 	 */
 	public function setModulePrefix($prefix)
 	{
 		$this->modulePrefix = $prefix;
 	}
 
 	/**
 	 * Parses url
 	 *
 	 * @return void
 	 */
 	public function parseRewriteURL()
 	{
 		$url = $this->Application->GetVar('_mod_rw_url_');
 
 		if ( $url ) {
 			$this->_redirectToDefaultUrlEnding($url);
 			$url = $this->_removeUrlEnding($url);
 		}
 
 		$cached = $this->_getCachedUrl($url);
 
 		if ( $cached !== false ) {
 			$vars = $cached['vars'];
 			$passed = $cached['passed'];
 		}
 		else {
 			$vars = $this->parse($url);
 			$passed = $vars['pass']; // also used in bottom of this method
 			unset($vars['pass']);
 
 			if ( !$this->_partsToParse ) {
 				// don't cache 404 Not Found
 				$this->_setCachedUrl($url, Array ('vars' => $vars, 'passed' => $passed));
 			}
 			else {
 				header('HTTP/1.0 404 Not Found');
 			}
 
 			if ( $this->Application->GetVarDirect('t', 'Post') ) {
 				// template from POST overrides template from URL.
 				$vars['t'] = $this->Application->GetVarDirect('t', 'Post');
 
 				if ( isset($vars['is_virtual']) && $vars['is_virtual'] ) {
 					$vars['m_cat_id'] = 0; // this is virtual template category (for Proj-CMS)
 				}
 			}
 
 			unset($vars['is_virtual']);
 		}
 
 		foreach ($vars as $name => $value) {
 			$this->HTTPQuery->Set($name, $value);
 		}
 
 		$this->_initAll(); // also will use parsed language to load phrases from it
 
 		$this->HTTPQuery->finalizeParsing($passed);
 	}
 
 	/**
 	 * Detects url ending of given url
 	 *
 	 * @param string $url
 	 * @return string
 	 * @access protected
 	 */
 	protected function _findUrlEnding($url)
 	{
 		if ( !$url ) {
 			return '';
 		}
 
 		foreach ($this->_urlEndings as $url_ending) {
 			if ( mb_substr($url, mb_strlen($url) - mb_strlen($url_ending)) == $url_ending ) {
 				return $url_ending;
 			}
 		}
 
 		return '';
 	}
 
 	/**
 	 * Removes url ending from url
 	 *
 	 * @param string $url
 	 * @return string
 	 * @access protected
 	 */
 	protected function _removeUrlEnding($url)
 	{
 		$url_ending = $this->_findUrlEnding($url);
 
 		if ( !$url_ending ) {
 			return $url;
 		}
 
 		return mb_substr($url, 0, mb_strlen($url) - mb_strlen($url_ending));
 	}
 
 	/**
 	 * Redirects user to page with default url ending, where needed
 	 *
 	 * @param string $url
 	 * @return void
 	 * @access protected
 	 */
 	protected function _redirectToDefaultUrlEnding($url)
 	{
 		$default_ending = $this->Application->ConfigValue('ModRewriteUrlEnding');
 
 		if ( $this->_findUrlEnding($url) == $default_ending || !$this->Application->ConfigValue('ForceModRewriteUrlEnding') ) {
 			return;
 		}
 
 		// user manually typed url with different url ending -> redirect to same url with default url ending
 		$target_url = $this->Application->BaseURL() . $this->_removeUrlEnding($url) . $default_ending;
 
 		trigger_error('Mod-rewrite url "<strong>' . $_SERVER['REQUEST_URI'] . '</strong>" without "<strong>' . $default_ending . '</strong>" line ending used', E_USER_NOTICE);
 		$this->Application->Redirect('external:' . $target_url, Array ('response_code' => 301));
 	}
 
 	/**
 	 * Returns url parsing result from cache or false, when not yet parsed
 	 *
 	 * @param $url
 	 * @return Array|bool
 	 * @access protected
 	 */
 	protected function _getCachedUrl($url)
 	{
 		if ( !$url || (defined('DBG_CACHE_URLS') && !DBG_CACHE_URLS) ) {
 			return false;
 		}
 
 		$sql = 'SELECT *
 				FROM ' . TABLE_PREFIX . 'CachedUrls
 				WHERE Hash = ' . kUtil::crc32($url) . ' AND DomainId = ' . (int)$this->Application->siteDomainField('DomainId');
 		$data = $this->Conn->GetRow($sql);
 
 		if ( $data ) {
 			$lifetime = (int)$data['LifeTime']; // in seconds
 			if ( ($lifetime > 0) && ($data['Cached'] + $lifetime < TIMENOW) ) {
 				// delete expired
 				$sql = 'DELETE FROM ' . TABLE_PREFIX . 'CachedUrls
 						WHERE UrlId = ' . $data['UrlId'];
 				$this->Conn->Query($sql);
 
 				return false;
 			}
 
 			return unserialize($data['ParsedVars']);
 		}
 
 		return false;
 	}
 
 	/**
 	 * Caches url
 	 *
 	 * @param string $url
 	 * @param Array $data
 	 * @return void
 	 * @access protected
 	 */
 	protected function _setCachedUrl($url, $data)
 	{
 		if ( !$url || (defined('DBG_CACHE_URLS') && !DBG_CACHE_URLS) ) {
 			return;
 		}
 
 		$vars = $data['vars'];
 		$passed = $data['passed'];
 		sort($passed);
 
 		// get expiration
 		if ( $vars['m_cat_id'] > 0 ) {
 			$sql = 'SELECT PageExpiration
 					FROM ' . TABLE_PREFIX . 'Categories
 					WHERE CategoryId = ' . $vars['m_cat_id'];
 			$expiration = $this->Conn->GetOne($sql);
 		}
 
 		// get prefixes
 		$prefixes = Array ();
 		$m_index = array_search('m', $passed);
 
 		if ( $m_index !== false ) {
 			unset($passed[$m_index]);
 
 			if ( $vars['m_cat_id'] > 0 ) {
 				$prefixes[] = 'c:' . $vars['m_cat_id'];
 			}
 
 			$prefixes[] = 'lang:' . $vars['m_lang'];
 			$prefixes[] = 'theme:' . $vars['m_theme'];
 		}
 
 		foreach ($passed as $prefix) {
 			if ( array_key_exists($prefix . '_id', $vars) && is_numeric($vars[$prefix . '_id']) ) {
 				$prefixes[] = $prefix . ':' . $vars[$prefix . '_id'];
 			}
 			else {
 				$prefixes[] = $prefix;
 			}
 		}
 
 		$fields_hash = Array (
 			'Url' => $url,
 			'Hash' => kUtil::crc32($url),
 			'DomainId' => (int)$this->Application->siteDomainField('DomainId'),
 			'Prefixes' => $prefixes ? '|' . implode('|', $prefixes) . '|' : '',
 			'ParsedVars' => serialize($data),
 			'Cached' => time(),
 			'LifeTime' => isset($expiration) && is_numeric($expiration) ? $expiration : -1
 		);
 
 		$this->Conn->doInsert($fields_hash, TABLE_PREFIX . 'CachedUrls');
 	}
 
 	/**
 	 * Loads all registered routers, so they could be quickly accessed later.
 	 *
 	 * @return void
 	 */
 	protected function initRouters()
 	{
 		static $init_done = false;
 
 		// Not initialized OR mod-rewrite url with missing config cache.
 		if ( $init_done || count($this->Application->routers) == 0 ) {
 			return;
 		}
 
 		foreach ( $this->Application->routers as $prefix => $router_data ) {
 			$this->routers[$prefix] = $this->Application->makeClass($router_data['class']);
 		}
 
 		define('MOD_REWRITE_URL_ENDING', $this->Application->ConfigValue('ModRewriteUrlEnding'));
 		$init_done = true;
 	}
 
 	/**
 	 * Parses given string into a set of variables (url in this case)
 	 *
 	 * @param string $string
 	 * @param string $pass_name
 	 * @return Array
 	 * @access public
 	 */
 	public function parse($string, $pass_name = 'pass')
 	{
 		// external url (could be back this website as well)
 		if ( preg_match('/external:(.*)/', $string, $regs) ) {
 			$string = $regs[1];
 		}
 
 		$vars = Array ();
 		$url_components = parse_url($string);
 
 		if ( isset($url_components['query']) ) {
 			parse_str(html_entity_decode($url_components['query']), $url_params);
 
 			if ( isset($url_params[ENV_VAR_NAME]) ) {
 				$url_params = array_merge($url_params, $this->manager->plain->parse($url_params[ENV_VAR_NAME], $pass_name));
 				unset($url_params[ENV_VAR_NAME]);
 			}
 
 			$vars = array_merge($vars, $url_params);
 		}
 
 		$this->_fixPass($vars, $pass_name);
 
 		if ( isset($url_components['path']) ) {
 			if ( BASE_PATH ) {
 				$string = preg_replace('/^' . preg_quote(BASE_PATH, '/') . '/', '', $url_components['path'], 1);
 			}
 			else {
 				$string = $url_components['path'];
 			}
 
 			$string = $this->_removeUrlEnding(trim($string, '/'));
 		}
 		else {
 			$string = '';
 		}
 
 		$url_parts = $string ? explode('/', mb_strtolower($string)) : Array ();
 
 		$this->setModulePrefix(false);
 		$this->_partsToParse = $url_parts;
 
 		if ( ($this->HTTPQuery->Get('rewrite') == 'on') || !$url_parts ) {
 			$this->_setDefaultValues($vars);
 		}
 
 		if ( !$url_parts ) {
 			$this->_initAll();
 			$vars['t'] = $this->Application->UrlManager->getTemplateName();
 
 			return $vars;
 		}
 
 		$this->_parseLanguage($url_parts, $vars);
 		$this->_parseTheme($url_parts, $vars);
 
 		// http://site-url/<language>/<theme>/<category>[_<category_page>]/<template>/<module_page>
 		// http://site-url/<language>/<theme>/<category>[_<category_page>]/<module_page> (category-based section template)
 		// http://site-url/<language>/<theme>/<category>[_<category_page>]/<template>/<module_item>
 		// http://site-url/<language>/<theme>/<category>[_<category_page>]/<module_item> (category-based detail template)
 		// http://site-url/<language>/<theme>/<rl_injections>/<category>[_<category_page>]/<rl_part> (customized url)
 
 		if ( !$this->processRouters($url_parts, $vars) ) {
 			// Routers weren't able to determine template.
 			$this->_parsePhysicalTemplate($url_parts, $vars);
 
 			if ( ($this->modulePrefix === false) && $vars['m_cat_id'] && !$this->_partsToParse ) {
 				// no category item found, but category found and all url matched -> module index page
 				return $vars;
 			}
 		}
 
 		if ( $this->_partsToParse ) {
 			/** @var kThemesHelper $themes_helper */
 			$themes_helper = $this->Application->recallObject('ThemesHelper');
 
 			$not_found = $this->Application->ConfigValue('ErrorTemplate');
 			$vars['t'] = $not_found ? $not_found : 'error_notfound';
 			$vars['m_cat_id'] = $themes_helper->getPageByTemplate($vars['t'], $vars['m_theme']);
 			$vars['pass'] = array('m');
 		}
 
 		return $vars;
 	}
 
 	/**
 	 * Ensures, that "m" is always in "pass" variable
 	 *
 	 * @param Array $vars
 	 * @param string $pass_name
 	 * @return void
 	 * @access protected
 	 */
 	protected function _fixPass(&$vars, $pass_name)
 	{
 		if ( isset($vars[$pass_name]) ) {
 			$vars[$pass_name] = array_unique(explode(',', 'm,' . $vars[$pass_name]));
 		}
 		else {
 			$vars[$pass_name] = Array ('m');
 		}
 	}
 
 	/**
 	 * Initializes theme & language based on parse results
 	 *
 	 * @return void
 	 * @access protected
 	 */
 	protected function _initAll()
 	{
 		$this->Application->VerifyThemeId();
 		$this->Application->VerifyLanguageId();
 
 		// No need, since we don't have any cached phrase IDs + nobody will use kPhraseCache::LanguageId soon.
 		// $this->Application->Phrases->Init('phrases');
 	}
 
 	/**
 	 * Sets default parsed values before actual url parsing (only, for empty url)
 	 *
 	 * @param Array $vars
 	 * @access protected
 	 */
 	protected function _setDefaultValues(&$vars)
 	{
 		$defaults = Array (
 			'm_cat_id' => 0, // no category
 			'm_cat_page' => 1, // first category page
 			'm_opener' => 's', // stay on same page
 			't' => 'index' // main site page
 		);
 
 		if ($this->primaryLanguageId) {
 			// domain-based primary language
 			$defaults['m_lang'] = $this->primaryLanguageId;
 		}
 
 		if ($this->primaryThemeId) {
 			// domain-based primary theme
 			$defaults['m_theme'] = $this->primaryThemeId;
 		}
 
 		foreach ($defaults as $default_key => $default_value) {
 			if ($this->HTTPQuery->Get($default_key) === false) {
 				$vars[$default_key] = $default_value;
 			}
 		}
 	}
 
 	/**
 	 * Processes url using routers.
 	 *
 	 * Pattern: Chain of Command
 	 *
 	 * @param array $url_parts Url parts.
 	 * @param array $vars      Vars.
 	 *
 	 * @return boolean
 	 */
 	protected function processRouters(array &$url_parts, array &$vars)
 	{
 		$this->initRouters();
 		$page_number = $this->_parsePage($url_parts, $vars);
 
 		foreach ( $this->routers as $prefix => $router ) {
 			if ( $page_number ) {
 				// Page given in url - use it.
 				$vars[$prefix . '_id'] = 0;
 				$vars[$prefix . '_Page'] = $page_number;
 			}
 
 			if ( $router->parse($url_parts, $vars) === false ) {
 				// Will not proceed to other methods.
 				return true;
 			}
 		}
 
 		// Will proceed to other methods.
 		return false;
 	}
 
 	/**
 	 * Set's page (when found) to all modules
 	 *
 	 * @param Array $url_parts
 	 * @param Array $vars
 	 * @return string
 	 * @access protected
 	 *
 	 * @todo Should find a way, how to determine what router page is it.
 	 */
 	protected function _parsePage(&$url_parts, &$vars)
 	{
 		if (!$url_parts) {
 			return false;
 		}
 
 		$page_number = end($url_parts);
 		if (!is_numeric($page_number)) {
 			return false;
 		}
 
 		array_pop($url_parts);
 		$this->partParsed($page_number, 'rtl');
 
 		return $page_number;
 	}
 
 	/**
 	 * Gets language part from url
 	 *
 	 * @param Array $url_parts
 	 * @param Array $vars
 	 * @return bool
 	 * @access protected
 	 */
 	protected function _parseLanguage(&$url_parts, &$vars)
 	{
 		if (!$url_parts) {
 			return false;
 		}
 
 		$url_part = reset($url_parts);
 
 		$sql = 'SELECT LanguageId, IF(LOWER(PackName) = ' . $this->Conn->qstr($url_part) . ', 2, PrimaryLang) AS SortKey
 				FROM ' . TABLE_PREFIX . 'Languages
 				WHERE Enabled = 1
 				ORDER BY SortKey DESC';
 		$language_info = $this->Conn->GetRow($sql);
 
 		if ($language_info && $language_info['LanguageId'] && $language_info['SortKey']) {
 			// primary language will be selected in case, when $url_part doesn't match to other's language pack name
 			// don't use next enabled language, when primary language is disabled
 			$vars['m_lang'] = $language_info['LanguageId'];
 
 			if ($language_info['SortKey'] == 2) {
 				// language was found by pack name
 				array_shift($url_parts);
 				$this->partParsed($url_part);
 			}
 			elseif ($this->primaryLanguageId) {
 				// use domain-based primary language instead of site-wide primary language
 				$vars['m_lang'] = $this->primaryLanguageId;
 			}
 
 			return true;
 		}
 
 		return false;
 	}
 
 	/**
 	 * Gets theme part from url
 	 *
 	 * @param Array $url_parts
 	 * @param Array $vars
 	 * @return bool
 	 */
 	protected function _parseTheme(&$url_parts, &$vars)
 	{
 		if (!$url_parts) {
 			return false;
 		}
 
 		$url_part = reset($url_parts);
 
 		$sql = 'SELECT ThemeId, IF(LOWER(Name) = ' . $this->Conn->qstr($url_part) . ', 2, PrimaryTheme) AS SortKey, TemplateAliases
 				FROM ' . TABLE_PREFIX . 'Themes
 				WHERE Enabled = 1
 				ORDER BY SortKey DESC';
 		$theme_info = $this->Conn->GetRow($sql);
 
 		if ($theme_info && $theme_info['ThemeId'] && $theme_info['SortKey']) {
 			// primary theme will be selected in case, when $url_part doesn't match to other's theme name
 			// don't use next enabled theme, when primary theme is disabled
 			$vars['m_theme'] = $theme_info['ThemeId'];
 
 			if ($theme_info['TemplateAliases']) {
 				$this->_templateAliases = unserialize($theme_info['TemplateAliases']);
 			}
 			else {
 				$this->_templateAliases = Array ();
 			}
 
 			if ($theme_info['SortKey'] == 2) {
 				// theme was found by name
 				array_shift($url_parts);
 				$this->partParsed($url_part);
 			}
 			elseif ($this->primaryThemeId) {
 				// use domain-based primary theme instead of site-wide primary theme
 				$vars['m_theme'] = $this->primaryThemeId;
 			}
 
 			return true;
 		}
 
 		$vars['m_theme'] = 0; // required, because used later for category/template detection
 
 		return false;
 	}
 
 	/**
 	 * Parses real template name from url
 	 *
 	 * @param Array $url_parts
 	 * @param Array $vars
 	 * @return bool
 	 */
 	protected function _parsePhysicalTemplate($url_parts, &$vars)
 	{
 		if ( !$url_parts ) {
 			return false;
 		}
 
+		/** @var kThemesHelper $themes_helper */
 		$themes_helper = $this->Application->recallObject('ThemesHelper');
-		/* @var $themes_helper kThemesHelper */
 
 		do {
 			$index_added = false;
 			$template_path = implode('/', $url_parts);
 			$template_found = $themes_helper->getTemplateId($template_path, $vars['m_theme']);
 
 			if ( !$template_found ) {
 				$index_added = true;
 				$template_found = $themes_helper->getTemplateId($template_path . '/index', $vars['m_theme']);
 			}
 
 			if ( !$template_found ) {
 				array_shift($url_parts);
 			}
 		} while ( !$template_found && $url_parts );
 
 		if ( $template_found ) {
 			$template_parts = explode('/', $template_path);
 			$vars['t'] = $template_path . ($index_added ? '/index' : '');
 
 			while ( $template_parts ) {
 				$this->partParsed(array_pop($template_parts), 'rtl');
 			}
 
 			// 1. will damage actual category during category item review add process
 			// 2. will use "use_section" parameter of "m_Link" tag to gain same effect
 //			$vars['m_cat_id'] = $themes_helper->getPageByTemplate($template_path, $vars['m_theme']);
 
 			return true;
 		}
 
 		return false;
 	}
 
 	/**
 	 * Returns environment variable values for given prefix (uses directly given params, when available)
 	 *
 	 * @param string $prefix_special
 	 * @param Array $params
 	 * @param bool $keep_events
 	 * @return Array
 	 * @access public
 	 */
 	public function getProcessedParams($prefix_special, &$params, $keep_events)
 	{
 		list ($prefix) = explode('.', $prefix_special);
 
 		$query_vars = $this->Application->getUnitConfig($prefix)->getQueryString(Array ());
 
 		if ( !$query_vars ) {
 			// given prefix doesn't use "env" variable to pass it's data
 			return false;
 		}
 
 		$event_key = array_search('event', $query_vars);
 		if ( $event_key ) {
 			// pass through event of this prefix
 			unset($query_vars[$event_key]);
 		}
 
 		if ( array_key_exists($prefix_special . '_event', $params) && !$params[$prefix_special . '_event'] ) {
 			// if empty event, then remove it from url
 			unset($params[$prefix_special . '_event']);
 		}
 
 		// if pass events is off and event is not implicity passed
 		if ( !$keep_events && !array_key_exists($prefix_special . '_event', $params) ) {
 			unset($params[$prefix_special . '_event']); // remove event from url if requested
 			//otherwise it will use value from get_var
 		}
 
 		$processed_params = Array ();
 		foreach ($query_vars as $var_name) {
 			// if value passed in params use it, otherwise use current from application
 			$var_name = $prefix_special . '_' . $var_name;
 			$processed_params[$var_name] = array_key_exists($var_name, $params) ? $params[$var_name] : $this->Application->GetVar($var_name);
 
 			if ( array_key_exists($var_name, $params) ) {
 				unset($params[$var_name]);
 			}
 		}
 
 		return $processed_params;
 	}
 
 	/**
 	 * Returns module item details template specified in given category custom field for given module prefix
 	 *
 	 * @param int|Array $category
 	 * @param string $module_prefix
 	 * @param int $theme_id
 	 * @return string
 	 * @access public
 	 * @todo Move to kPlainUrlProcessor
 	 */
 	public function GetItemTemplate($category, $module_prefix, $theme_id = null)
 	{
 		if ( !isset($theme_id) ) {
 			$theme_id = $this->Application->GetVar('m_theme');
 		}
 
 		$category_id = is_array($category) ? $category['CategoryId'] : $category;
 		$cache_key = __CLASS__ . '::' . __FUNCTION__ . '[%CIDSerial:' . $category_id . '%][%ThemeIDSerial:' . $theme_id . '%]' . $module_prefix;
 
 		$cached_value = $this->Application->getCache($cache_key);
 		if ( $cached_value !== false ) {
 			return $cached_value;
 		}
 
 		if ( !is_array($category) ) {
 			if ( $category == 0 ) {
 				$category = $this->Application->findModule('Var', $module_prefix, 'RootCat');
 			}
 			$sql = 'SELECT c.ParentPath, c.CategoryId
 					FROM ' . TABLE_PREFIX . 'Categories AS c
 					WHERE c.CategoryId = ' . $category;
 			$category = $this->Conn->GetRow($sql);
 		}
 		$parent_path = implode(',', explode('|', substr($category['ParentPath'], 1, -1)));
 
 		// item template is stored in module' system custom field - need to get that field Id
 		$primary_lang = $this->Application->GetDefaultLanguageId();
 		$item_template_field_id = $this->getItemTemplateCustomField($module_prefix);
 
 		// looking for item template through cats hierarchy sorted by parent path
 		$query = '	SELECT ccd.l' . $primary_lang . '_cust_' . $item_template_field_id . ',
 								FIND_IN_SET(c.CategoryId, ' . $this->Conn->qstr($parent_path) . ') AS Ord1,
 								c.CategoryId, c.Name, ccd.l' . $primary_lang . '_cust_' . $item_template_field_id . '
 					FROM ' . TABLE_PREFIX . 'Categories AS c
 					LEFT JOIN ' . TABLE_PREFIX . 'CategoryCustomData AS ccd
 					ON ccd.ResourceId = c.ResourceId
 					WHERE c.CategoryId IN (' . $parent_path . ') AND ccd.l' . $primary_lang . '_cust_' . $item_template_field_id . ' != \'\'
 					ORDER BY FIND_IN_SET(c.CategoryId, ' . $this->Conn->qstr($parent_path) . ') DESC';
 		$item_template = $this->Conn->GetOne($query);
 
 		if ( !isset($this->_templateAliases) ) {
 			// when empty url OR mod-rewrite disabled
 
+			/** @var kThemesHelper $themes_helper */
 			$themes_helper = $this->Application->recallObject('ThemesHelper');
-			/* @var $themes_helper kThemesHelper */
 
 			$sql = 'SELECT TemplateAliases
 					FROM ' . TABLE_PREFIX . 'Themes
 					WHERE ThemeId = ' . (int)$themes_helper->getCurrentThemeId();
 			$template_aliases = $this->Conn->GetOne($sql);
 
 			$this->_templateAliases = $template_aliases ? unserialize($template_aliases) : Array ();
 		}
 
 		if ( substr($item_template, 0, 1) == '#' ) {
 			// it's template alias + "#" isn't allowed in filenames
 			$item_template = (string)getArrayValue($this->_templateAliases, $item_template);
 		}
 
 		$this->Application->setCache($cache_key, $item_template);
 
 		return $item_template;
 	}
 
 	/**
 	 * Returns category custom field id, where given module prefix item template name is stored
 	 *
 	 * @param string $module_prefix
 	 * @return int
 	 * @access public
 	 * @todo Move to kPlainUrlProcessor; decrease visibility, since used only during upgrade
 	 */
 	public function getItemTemplateCustomField($module_prefix)
 	{
 		$cache_key = __CLASS__ . '::' . __FUNCTION__ . '[%CfSerial%]:' . $module_prefix;
 		$cached_value = $this->Application->getCache($cache_key);
 
 		if ($cached_value !== false) {
 			return $cached_value;
 		}
 
 		$sql = 'SELECT CustomFieldId
 				FROM ' . TABLE_PREFIX . 'CustomFields
 				WHERE FieldName = ' . $this->Conn->qstr($module_prefix . '_ItemTemplate');
 		$item_template_field_id = $this->Conn->GetOne($sql);
 
 		$this->Application->setCache($cache_key, $item_template_field_id);
 
 		return $item_template_field_id;
 	}
 
 	/**
 	 * Marks url part as parsed
 	 *
 	 * @param string $url_part
 	 * @param string $parse_direction
 	 * @access public
 	 */
 	public function partParsed($url_part, $parse_direction = 'ltr')
 	{
 		if ( !$this->_partsToParse ) {
 			return ;
 		}
 
 		if ( $parse_direction == 'ltr' ) {
 			$expected_url_part = reset($this->_partsToParse);
 
 			if ( $url_part == $expected_url_part ) {
 				array_shift($this->_partsToParse);
 			}
 		}
 		else {
 			$expected_url_part = end($this->_partsToParse);
 
 			if ( $url_part == $expected_url_part ) {
 				array_pop($this->_partsToParse);
 			}
 		}
 
 		if ( $url_part != $expected_url_part ) {
 			trigger_error('partParsed: expected URL part "<strong>' . $expected_url_part . '</strong>", received URL part "<strong>' . $url_part . '</strong>"', E_USER_NOTICE);
 		}
 	}
 
 	/**
 	 * Determines if there is more to parse in url
 	 *
 	 * @return bool
 	 * @access public
 	 */
 	public function moreToParse()
 	{
 		return count($this->_partsToParse) > 0;
 	}
 
 	/**
 	 * Builds url
 	 *
 	 * @param string $t
 	 * @param Array $params
 	 * @param string $pass
 	 * @param bool $pass_events
 	 * @param bool $env_var
 	 * @return string
 	 * @access public
 	 */
 	public function build($t, $params, $pass = 'all', $pass_events = false, $env_var = false)
 	{
 		if ( $this->Application->GetVar('admin') || (array_key_exists('admin', $params) && $params['admin']) ) {
 			$params['admin'] = 1;
 
 			if ( !array_key_exists('editing_mode', $params) ) {
 				$params['editing_mode'] = EDITING_MODE;
 			}
 		}
 
 		$ret = '';
 		$env = '';
 
 		if ( isset($params['__SSL__']) ) {
 			unset($params['__SSL__']);
 		}
 
 		$catalog_item_found = false;
 		$pass_info = $this->getPassInfo($pass);
 
 		if ( $pass_info ) {
 			if ( $pass_info[0] == 'm' ) {
 				array_shift($pass_info);
 			}
 
 			$inject_parts = array(); // Url parts for beginning of url.
 			$params['t'] = $t; // Make template available for routers.
 			$params['pass_template'] = true; // By default we keep given template in resulting url.
 
 			if ( !array_key_exists('pass_category', $params) ) {
 				$params['pass_category'] = false; // by default we don't keep categories in url
 			}
 
 			foreach ($pass_info as $pass_index => $pass_element) {
 				list ($prefix) = explode('.', $pass_element);
 				$catalog_item = $this->Application->findModule('Var', $prefix) && $this->Application->getUnitConfig($prefix)->getCatalogItem();
 
 				if ( array_key_exists($prefix, $this->routers) ) {
 					// if next prefix is same as current, but with special => exclude current prefix from url
 					$next_prefix = array_key_exists($pass_index + 1, $pass_info) ? $pass_info[$pass_index + 1] : false;
 					if ( $next_prefix ) {
 						$next_prefix = substr($next_prefix, 0, strlen($prefix) + 1);
 						if ( $prefix . '.' == $next_prefix ) {
 							continue;
 						}
 					}
 
 					// rewritten url part
 					$url_part = $this->BuildModuleEnv($pass_element, $params, $pass_events);
 
 					if ( is_string($url_part) && $url_part ) {
 						$ret .= $url_part . '/';
 
 						if ( $catalog_item ) {
 							// pass category later only for catalog items
 							$catalog_item_found = true;
 						}
 					}
 					elseif ( is_array($url_part) ) {
 						// Router want to insert something at the beginning of url too.
 						if ( $url_part[0] ) {
 							$inject_parts[] = $url_part[0];
 						}
 
 						if ( $url_part[1] ) {
 							$ret .= $url_part[1] . '/';
 						}
 
 						if ( $catalog_item ) {
 							// pass category later only for catalog items
 							$catalog_item_found = true;
 						}
 					}
 					elseif ( $url_part === false ) {
 						// Router decided not to rewrite given $pass_element.
 						$env .= ':' . $this->manager->plain->BuildModuleEnv($pass_element, $params, $pass_events);
 					}
 				}
 				else {
 					$env .= ':' . $this->manager->plain->BuildModuleEnv($pass_element, $params, $pass_events);
 				}
 			}
 
 			if ( $catalog_item_found || preg_match('/c\.[-\d]*/', implode(',', $pass_info)) ) {
 				// "c" prefix is present -> keep category
 				$params['pass_category'] = true;
 			}
 
 			$params['inject_parts'] = $inject_parts;
 
 			$ret = $this->BuildModuleEnv('m', $params, $pass_events) . '/' . $ret;
 			$cat_processed = array_key_exists('category_processed', $params) && $params['category_processed'];
 
 			// Remove temporary parameters used by routers.
 			unset($params['t'], $params['inject_parts'], $params['pass_template'], $params['pass_category'], $params['category_processed']);
 
 			$ret = trim($ret, '/');
 
 			if ( isset($params['url_ending']) ) {
 				if ( $ret ) {
 					$ret .= $params['url_ending'];
 				}
 
 				unset($params['url_ending']);
 			}
 			elseif ( $ret ) {
 				$ret .= MOD_REWRITE_URL_ENDING;
 			}
 
 			if ( $env ) {
 				$params[ENV_VAR_NAME] = ltrim($env, ':');
 			}
 		}
 
 		unset($params['pass'], $params['opener'], $params['m_event']);
 
 		// TODO: why?
 //		$ret = str_replace('%2F', '/', urlencode($ret));
 
 		if ( $params ) {
 			$params_str = http_build_query($params);
 			$ret .= '?' . str_replace('%23', '#', $params_str);
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Builds env part that corresponds prefix passed
 	 *
 	 * @param string $prefix_special item's prefix & [special]
 	 * @param Array $params url params
 	 * @param bool $pass_events
 	 * @return string
 	 * @access protected
 	 */
 	protected function BuildModuleEnv($prefix_special, &$params, $pass_events = false)
 	{
 		list ($prefix) = explode('.', $prefix_special);
 
 		return $this->routers[$prefix]->buildWrapper($prefix_special, $params, $pass_events);
 	}
 }
Index: branches/5.3.x/core/kernel/managers/plain_url_processor.php
===================================================================
--- branches/5.3.x/core/kernel/managers/plain_url_processor.php	(revision 16518)
+++ branches/5.3.x/core/kernel/managers/plain_url_processor.php	(revision 16519)
@@ -1,263 +1,263 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class kPlainUrlProcessor extends kUrlProcessor {
 
 	/**
 	 * Process QueryString only, create events, ids, based on config
 	 * set template name and sid in desired application variables.
 	 *
 	 * @param string $env_var environment string value
 	 * @param string $pass_name
 	 * @return Array
 	 */
 	public function parse($env_var, $pass_name = 'passed')
 	{
 		// env=SID-TEMPLATE:m-1-1-1-1:l0-0-0:n-0-0-0:bb-0-0-1-1-1-0
 		if ( !$env_var ) {
 			return Array ('t' => $this->manager->getTemplateName());
 		}
 
 		parse_str(ENV_VAR_NAME . '=' . $env_var, $vars);
 		$env_var = $vars[ENV_VAR_NAME];
 		unset($vars[ENV_VAR_NAME]);
 
 		// replace escaped ":" symbol not to explode by it
 		$env_var = str_replace('\:', '_&+$$+&_', $env_var); // replace escaped "=" with spec-chars :)
 		$parts = explode(':', $env_var);
 
 		if ( !$this->Application->RewriteURLs() || ($this->Application->RewriteURLs() && $this->Application->GetVar('rewrite') != 'on') ) {
 			$vars = array_merge($vars, $this->extractSIDAndTemplate($parts));
 		}
 
 		if ( $parts ) {
 			$passed = Array ();
 
 			foreach ($parts as $mixed_part) {
 				list ($passed[], $processed_vars) = $this->_parseEnvPart($mixed_part);
 				$vars = array_merge($vars, $processed_vars);
 			}
 
 			$vars[$pass_name] = implode(',', array_unique($passed));
 		}
 
 		return $vars;
 	}
 
 	/**
 	 * Retrieves SessionID and current template from given ENV parts
 	 *
 	 * @param Array $parts
 	 * @return array
 	 * @access protected
 	 */
 	protected function extractSIDAndTemplate(&$parts)
 	{
 		$template = '';
 		$vars = Array ();
 
 		if ( preg_match('/^([\d]+|)-(.*)$/', $parts[0], $regs) ) {
 			// first "env" component matches "sid-template" format
 			// (will be false, when mod-rewrite url to home page is built)
 			$sid = $regs[1];
 			$template = $regs[2];
 			array_shift($parts);
 
 			if ( $sid ) {
 				// Save Session ID
 				$this->Application->SetVar('sid', $sid);
 				$vars['sid'] = $sid;
 			}
 		}
 
 		// Save Template Name
 		$vars['t'] = $this->manager->getTemplateName($template);
 
 		return $vars;
 	}
 
 	/**
 	 * Converts environment part into variable array (based on query map for given prefix)
 	 *
 	 * @param string $mixed_part
 	 * @return Array
 	 * @access protected
 	 */
 	protected function _parseEnvPart($mixed_part)
 	{
 		// In-portal old style env conversion - adds '-' between prefix and first var
 		$mixed_part = str_replace('_&+$$+&_', ':', $mixed_part);
 		$mixed_part = preg_replace("/^([a-zA-Z]+)([0-9]+)-(.*)/", "$1-$2-$3", $mixed_part);
 
 		// replace escaped "-" symbol not to explode by it
 		$escaped_part = str_replace('\-', '_&+$$+&_', $mixed_part);
 		$escaped_part = explode('-', $escaped_part);
 
 		$mixed_part = Array();
 		foreach ($escaped_part as $escaped_val) {
 			$mixed_part[] = str_replace('_&+$$+&_', '-', $escaped_val);
 		}
 
 		$vars = Array ();
 		$prefix_special = array_shift($mixed_part); // l.pick, l
 
+		/** @var kHTTPQuery $http_query */
 		$http_query = $this->Application->recallObject('kHTTPQuery');
-		/* @var $http_query kHTTPQuery */
 
 		$query_map = $http_query->discoverUnit($prefix_special); // from $_GET['env']
 
 		// if config is not defined for prefix in QueryString, then don't process it
 		if ($query_map) {
 			foreach ($query_map as $index => $var_name) {
 				// l_id, l_page, l_bla-bla-bla
 				$val = $mixed_part[$index - 1];
 				if ($val == '') $val = false;
 				$vars[$prefix_special.'_'.$var_name] = $val;
 			}
 		}
 
 		return Array ($prefix_special, $vars);
 	}
 
 	/**
 	 * Builds url
 	 *
 	 * @param string $t
 	 * @param Array $params
 	 * @param string $pass
 	 * @param bool $pass_events
 	 * @param bool $env_var
 	 * @return string
 	 * @access public
 	 */
 	public function build($t, $params, $pass='all', $pass_events = false, $env_var = true)
 	{
 		if ( $this->Application->GetVar('admin') || (array_key_exists('admin', $params) && $params['admin']) ) {
 			$params['admin'] = 1;
 
 			if ( !array_key_exists('editing_mode', $params) ) {
 				$params['editing_mode'] = EDITING_MODE;
 			}
 		}
 
 		$ssl = isset($params['__SSL__']) ? $params['__SSL__'] : 0;
 		$sid = isset($params['sid']) && !$this->Application->RewriteURLs($ssl) ? $params['sid'] : '';
 
 		if ( isset($params['__SSL__']) ) {
 			unset($params['__SSL__']);
 		}
 
 		$env_string = '';
 		$category_id = isset($params['m_cat_id']) ? $params['m_cat_id'] : $this->Application->GetVar('m_cat_id');
 
 		$item_id = false;
 		$pass_info = $this->getPassInfo($pass);
 
 		if ( $pass_info ) {
 			if ( $pass_info[0] == 'm' ) {
 				array_shift($pass_info);
 			}
 
 			foreach ($pass_info as $pass_element) {
 				list($prefix) = explode('.', $pass_element);
 				$require_rewrite = $this->Application->findModule('Var', $prefix);
 
 				if ( $require_rewrite ) {
 					$item_id = isset($params[$pass_element . '_id']) ? $params[$pass_element . '_id'] : $this->Application->GetVar($pass_element . '_id');
 				}
 
 				$env_string .= ':' . $this->BuildModuleEnv($pass_element, $params, $pass_events);
 			}
 		}
 
 		if ( strtolower($t) == '__default__' ) {
 			if ( is_numeric($item_id) ) {
 				$this->manager->initRewrite();
 				$t = $this->manager->rewrite->GetItemTemplate($category_id, $pass_element); // $pass_element should be the last processed element
 				// $t = $this->Application->getCategoryCache($category_id, 'item_templates');
 			}
 			elseif ( $category_id ) {
 				$t = strtolower(preg_replace('/^Content\//i', '', $this->Application->getCategoryCache($category_id, 'filenames')));
 			}
 			else {
 				$t = 'index';
 			}
 		}
 
 		$env_string = $sid . '-' . $t . ':' . $this->BuildModuleEnv('m', $params, $pass_events) . $env_string;
 		unset($params['pass'], $params['opener'], $params['m_event']);
 		$params = array(ENV_VAR_NAME => $env_string) + $params;
 
 		$params_str = http_build_query($params);
 		$ret = str_replace('%23', '#', $params_str);
 
 		if ( !$env_var ) {
 			$ret = substr($ret, strlen(ENV_VAR_NAME) + 1);
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Builds env part that corresponds prefix passed
 	 *
 	 * @param string $prefix_special item's prefix & [special]
 	 * @param Array $params url params
 	 * @param bool $pass_events
 	 * @return string
 	 * @access public
 	 */
 	public function BuildModuleEnv($prefix_special, &$params, $pass_events = false)
 	{
 		list($prefix) = explode('.', $prefix_special);
 		$config = $this->Application->getUnitConfig($prefix);
 
 		$query_vars = $config->getQueryString(Array ());
 
 		//if pass events is off and event is not implicitly passed
 		if ( !$pass_events && !isset($params[$prefix_special . '_event']) ) {
 			$params[$prefix_special . '_event'] = ''; // remove event from url if requested
 			//otherwise it will use value from get_var
 		}
 
 		if ( !$query_vars ) {
 			return '';
 		}
 
 		$tmp_string = Array (0 => $prefix_special);
 		foreach ($query_vars as $index => $var_name) {
 			//if value passed in params use it, otherwise use current from application
 			$var_name = $prefix_special . '_' . $var_name;
 			$tmp_string[$index] = isset($params[$var_name]) ? $params[$var_name] : $this->Application->GetVar($var_name);
 
 			if ( isset($params[$var_name]) ) {
 				unset($params[$var_name]);
 			}
 		}
 
 		$escaped = array ();
 		foreach ($tmp_string as $tmp_val) {
 			$escaped[] = str_replace(Array ('-', ':'), Array ('\-', '\:'), $tmp_val);
 		}
 
 		$ret = implode('-', $escaped);
 		if ( $config->getPortalStyleEnv() == true ) {
 			$ret = preg_replace('/^([a-zA-Z]+)-([0-9]+)-(.*)/', '\\1\\2-\\3', $ret);
 		}
 
 		return $ret;
 	}
 }
Index: branches/5.3.x/core/kernel/event_manager.php
===================================================================
--- branches/5.3.x/core/kernel/event_manager.php	(revision 16518)
+++ branches/5.3.x/core/kernel/event_manager.php	(revision 16519)
@@ -1,513 +1,513 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class kEventManager extends kBase implements kiCacheable {
 
 	/**
 	 * Instance of hook manager
 	 *
 	 * @var kHookManager
 	 * @access protected
 	 */
 	protected $Hooks = null;
 
 	/**
 	 * Instance of scheduled task manager
 	 *
 	 * @var kScheduledTaskManager
 	 * @access protected
 	 */
 	protected $ScheduledTasks = null;
 
 	/**
 	 * Instance of request manager
 	 *
 	 * @var kRequestManager
 	 * @access protected
 	 */
 	protected $Request = null;
 
 	/**
 	 * Build events registred for pseudo classes.
 	 * key - pseudo class, value - event name
 	 *
 	 * @var Array
 	 * @access protected
 	 */
 	protected $buildEvents = Array ();
 
 	/**
 	 * Event recursion tracking stack
 	 *
 	 * @var Array
 	 * @access protected
 	 */
 	protected $recursionStack = Array ();
 
 	/**
 	 * Creates new instance of kEventManager class
 	 *
 	 */
 	public function __construct()
 	{
 		parent::__construct();
 
 		$this->Hooks = $this->Application->makeClass('kHookManager');
 		$this->ScheduledTasks = $this->Application->makeClass('kScheduledTaskManager');
 		$this->Request = $this->Application->makeClass('kRequestManager');
 	}
 
 	/**
 	 * Sets data from cache to object
 	 *
 	 * @param Array $data
 	 * @access public
 	 */
 	public function setFromCache(&$data)
 	{
 		$this->Hooks->setFromCache($data);
 		$this->ScheduledTasks->setFromCache($data);
 
 		$this->buildEvents = $data['EventManager.buildEvents'];
 	}
 
 	/**
 	 * Gets object data for caching
 	 *
 	 * @return Array
 	 * @access public
 	 */
 	public function getToCache()
 	{
 		return array_merge(
 			$this->Hooks->getToCache(),
 			$this->ScheduledTasks->getToCache(),
 			Array (
 				'EventManager.buildEvents' => $this->buildEvents,
 			)
 		);
 	}
 
 	/**
 	 * Returns information about registered scheduled tasks
 	 *
 	 * @param bool $from_cache
 	 * @return Array
 	 * @access public
 	 */
 	public function getScheduledTasks($from_cache = false)
 	{
 		return $this->ScheduledTasks->getAll($from_cache);
 	}
 
 	/**
 	 * Add new scheduled task
 	 *
 	 * @param string $short_name name to be used to store last maintenance run info
 	 * @param string $event_string
 	 * @param int $run_schedule run schedule like for Cron
 	 * @param string $module
 	 * @param int $status
 	 * @access public
 	 */
 	public function registerScheduledTask($short_name, $event_string, $run_schedule, $module, $status = STATUS_ACTIVE)
 	{
 		$this->ScheduledTasks->add($short_name, $event_string, $run_schedule, $module, $status);
 	}
 
 	/**
 	 * Run registered scheduled tasks with specified event type
 	 *
 	 * @param bool $from_cron
 	 * @access public
 	 */
 	public function runScheduledTasks($from_cron = false)
 	{
 		$this->ScheduledTasks->runAll($from_cron);
 	}
 
 	/**
 	 * Runs scheduled task based on given data
 	 *
 	 * @param Array $scheduled_task_data
 	 * @return bool
 	 * @access public
 	 */
 	public function runScheduledTask($scheduled_task_data)
 	{
 		return $this->ScheduledTasks->run($scheduled_task_data);
 	}
 
 	/**
 	 * Registers Hook from sub-prefix event to master prefix event
 	 *
 	 * Pattern: Observer
 	 *
 	 * @param string $hook_event
 	 * @param string $do_event
 	 * @param int $mode
 	 * @param bool $conditional
 	 * @access public
 	 */
 	public function registerHook($hook_event, $do_event, $mode = hAFTER, $conditional = false)
 	{
 		$this->Hooks->registerHook($hook_event, $do_event, $mode, $conditional);
 	}
 
 	/**
 	 * Registers build event for given pseudo class
 	 *
 	 * @param string $pseudo_class
 	 * @param string $event_name
 	 * @access public
 	 */
 	public function registerBuildEvent($pseudo_class, $event_name)
 	{
 		$this->buildEvents[$pseudo_class] = $event_name;
 	}
 
 	/**
 	 * Runs build event for given $pseudo_class instance, when defined
 	 *
 	 * @param string $prefix_special
 	 * @param string $pseudo_class
 	 * @param Array $event_params
 	 * @access public
 	 */
 	public function runBuildEvent($prefix_special, $pseudo_class, $event_params)
 	{
 		if ( !isset($this->buildEvents[$pseudo_class]) ) {
 			return ;
 		}
 
 		$event = new kEvent($prefix_special . ':' . $this->buildEvents[$pseudo_class], $event_params);
 		$this->HandleEvent($event);
 	}
 
 	/**
 	 * Check if event is called twice, that causes recursion
 	 *
 	 * @param kEvent $event
 	 * @return bool
 	 * @access protected
 	 */
 	protected function isRecursion($event)
 	{
 		$event_key = $event->getPrefixSpecial() . ':' . $event->Name;
 
 		return in_array($event_key, $this->recursionStack);
 	}
 
 	/**
 	 * Adds event to recursion stack
 	 *
 	 * @param kEvent $event
 	 * @access protected
 	 */
 	protected function pushEvent($event)
 	{
 		$event_key = $event->getPrefixSpecial() . ':' . $event->Name;
 
 		array_push($this->recursionStack, $event_key);
 	}
 
 	/**
 	 * Removes event from recursion stack
 	 *
 	 * @access protected
 	 */
 	protected function popEvent()
 	{
 		array_pop($this->recursionStack);
 	}
 
 	/**
 	 * Allows to process any type of event
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access public
 	 */
 	public function HandleEvent($event)
 	{
 		if ( $this->isRecursion($event) || !$this->verifyEventPrefix($event) ) {
 			return;
 		}
 
 		$this->pushEvent($event);
 
 		if ( !$event->SkipBeforeHooks ) {
 			$this->Hooks->runHooks($event, hBEFORE);
 
 			if ( $event->status == kEvent::erFATAL ) {
 				return;
 			}
 		}
 
+		/** @var kEventHandler $event_handler */
 		$event_handler = $this->Application->recallObject($event->Prefix . '_EventHandler');
-		/* @var $event_handler kEventHandler */
 
 		$event_handler->processEvent($event);
 
 		if ( $event->status == kEvent::erFATAL ) {
 			return;
 		}
 
 		if ( !$event->SkipAfterHooks ) {
 			$this->Hooks->runHooks($event, hAFTER);
 		}
 
 		$this->popEvent();
 	}
 
 	/**
 	 * Notifies event subscribers, that event has occured
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 */
 	public function notifySubscribers(kEvent $event)
 	{
 		if ( $event->status != kEvent::erSUCCESS ) {
 			return;
 		}
 
 		$cache_key = 'email_to_event_mapping[%EmailTemplateSerial%]';
 		$event_mapping = $this->Application->getCache($cache_key);
 
 		if ( $event_mapping === false ) {
 			$this->Conn->nextQueryCachable = true;
 			$sql = 'SELECT TemplateId, TemplateName, Type, BindToSystemEvent
 					FROM ' . $this->Application->getUnitConfig('email-template')->getTableName() . '
 					WHERE BindToSystemEvent <> ""';
 			$event_mapping = $this->Conn->Query($sql, 'BindToSystemEvent');
 
 			$this->Application->setCache($cache_key, $event_mapping);
 		}
 
 		$email_template = Array ();
 
 		if ( isset($event_mapping[(string)$event]) ) {
 			$email_template = $event_mapping[(string)$event];
 		}
 		elseif ( isset($event_mapping[$event->Prefix . '.*:' . $event->Name]) ) {
 			$email_template = $event_mapping[$event->Prefix . '.*:' . $event->Name];
 		}
 
 		if ( !$email_template ) {
 			return;
 		}
 
 		$where_clause = Array ();
 		$where_clause['EmailTemplateId'] = 'EmailTemplateId = ' . $email_template['TemplateId'];
 
 		try {
 			$category_ids = Array ();
 
+			/** @var kDBItem $category */
 			$category = $this->Application->recallObject('c');
-			/* @var $category kDBItem */
 
 			if ( $category->isLoaded() ) {
 				$category_ids = explode('|', substr($category->GetDBField('ParentPath'), 1, -1));
 			}
 		}
 		catch (Exception $e) {
 		}
 
 		$where_clause['CategoryId'] = $this->_getSubscriberFilter('CategoryId', $category_ids, true);
 
 		try {
 			$item_id = $parent_item_id = false;
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			if ( $object->isLoaded() ) {
 				$item_id = $object->GetID();
 				$parent_prefix = $event->getUnitConfig()->getParentPrefix();
 
 				if ( $parent_prefix ) {
 					$parent_item_id = $object->getParentId($parent_prefix);
 				}
 			}
 		}
 		catch (Exception $e) {
 		}
 
 		$where_clause['ItemId'] = $this->_getSubscriberFilter('ItemId', $item_id);
 		$where_clause['ParentItemId'] = $this->_getSubscriberFilter('ParentItemId', $parent_item_id);
 
 		$event_params = Array (
 			'EmailTemplateId' => $email_template['TemplateId'],
 			'CategoryIds' => $category_ids,
 			'ItemId' => $item_id,
 			'ParentId' => $parent_item_id,
 			'where_clause' => $where_clause,
 		);
 
 		$sql_event = new kEvent($event->getPrefixSpecial() . ':OnGetEventSubscribersQuery', $event_params);
 		$sql_event->MasterEvent = $event;
 		$this->HandleEvent($sql_event);
 
 		$subscribers = $this->Conn->GetIterator($sql_event->getEventParam('sql'));
 
 		if ( !count($subscribers) ) {
 			// mapping exists, but nobody has subscribed
 			return;
 		}
 
 		$send_params = Array (
 			'Prefix' => $event->Prefix,
 			'Special' => $event->Special,
 			'PrefixSpecial' => $event->getPrefixSpecial(),
 		);
 
 		$send_method = $email_template['Type'] == EmailTemplate::TEMPLATE_TYPE_FRONTEND ? 'emailUser' : 'emailAdmin';
 
 		foreach ($subscribers as $subscriber_info) {
 			$send_params['to_name'] = $subscriber_info['SubscriberEmail'];
 			$send_params['to_email'] = $subscriber_info['SubscriberEmail'];
 			$this->Application->$send_method($email_template['TemplateName'], $subscriber_info['UserId'], $send_params);
 		}
 	}
 
 	/**
 	 * Returns filter for searching event subscribers
 	 *
 	 * @param string $field
 	 * @param mixed $value
 	 * @param bool $is_category
 	 * @return string
 	 * @access protected
 	 */
 	protected function _getSubscriberFilter($field, $value, $is_category = false)
 	{
 		if ( $value ) {
 			// send to this item subscribers AND to subscribers to all items
 			if ( $is_category ) {
 				$clause = 'IF(IncludeSublevels = 1, ' . $field . ' IN (' . implode(',', $value) . '), ' . $field . ' = ' . end($value) . ')';
 			}
 			else {
 				$clause = $field . ' = ' . $this->Conn->qstr($value);
 			}
 
 			return $clause . ' OR ' . $field . ' IS NULL';
 		}
 
 		// send to subscribers to all items
 		return $field . ' IS NULL';
 	}
 
 	/**
 	 * Checks, that given event is implemented
 	 *
 	 * @param kEvent $event
 	 * @return bool
 	 * @access public
 	 */
 	public function eventImplemented(kEvent $event)
 	{
 		if ( !$this->verifyEventPrefix($event, true) ) {
 			return false;
 		}
 
+		/** @var kEventHandler $event_handler */
 		$event_handler = $this->Application->recallObject($event->Prefix . '_EventHandler');
-		/* @var $event_handler kEventHandler */
 
 		return $event_handler->getEventMethod($event) != '';
 	}
 
 	/**
 	 * Checks if event prefix is valid
 	 *
 	 * @param kEvent $event
 	 * @param bool $is_fatal
 	 * @return string
 	 * @access public
 	 */
 	public function verifyEventPrefix($event, $is_fatal = false)
 	{
 		if ( !$this->Application->prefixRegistred($event->Prefix) ) {
 			// when "l-cdata" is requested, then load "l", that will clone "l-cdata" unit config
 			$this->Application->UnitConfigReader->loadConfig($event->Prefix);
 
 			if ( !$this->Application->prefixRegistred($event->Prefix) ) {
 				$error_msg = 'Prefix "<strong>' . $event->Prefix . '</strong>" not registred (requested event "<strong>' . $event->Name . '</strong>")';
 
 				if ($is_fatal) {
 					throw new Exception($error_msg);
 				}
 				else {
 					trigger_error($error_msg, E_USER_WARNING);
 				}
 
 				return false;
 			}
 		}
 
 		return true;
 	}
 
 	/**
 	 * Processes request
 	 *
 	 * @access public
 	 */
 	public function ProcessRequest()
 	{
 		$this->Request->process();
 	}
 
 	/**
 	 * Allows to add new element to opener stack
 	 *
 	 * @param string $template
 	 * @param Array $params
 	 * @access public
 	 */
 	public function openerStackPush($template = '', $params = Array ())
 	{
 		$this->Request->openerStackPush($template, $params);
 	}
 
 	/**
 	 * Set's new event for $prefix_special
 	 * passed
 	 *
 	 * @param string $prefix_special
 	 * @param string $event_name
 	 * @access public
 	 */
 	public function setEvent($prefix_special,$event_name)
 	{
+		/** @var Params $actions */
 		$actions = $this->Application->recallObject('kActions');
-		/* @var $actions Params */
 
 		$actions->Set('events[' . $prefix_special . ']', $event_name);
 	}
 
 	/**
 	 * Allows to determine, that required event is beeing processed right now
 	 *
 	 * @param string $event_key Event name in format prefix[.special]:event_name
 	 * @return bool
 	 * @access public
 	 */
 	public function eventRunning($event_key)
 	{
 		return array_search($event_key, $this->recursionStack) !== false;
 	}
 }
\ No newline at end of file
Index: branches/5.3.x/core/kernel/processors/tag_processor.php
===================================================================
--- branches/5.3.x/core/kernel/processors/tag_processor.php	(revision 16518)
+++ branches/5.3.x/core/kernel/processors/tag_processor.php	(revision 16519)
@@ -1,347 +1,348 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class kTagProcessor extends kBase {
 
 		/**
 		 * Returns joined prefix and special if any
 		 *
 		 * @param bool $from_submit if true, then joins prefix & special by "_", uses  "." otherwise
 		 * @return string
 		 * @access public
 		 */
 		public function getPrefixSpecial($from_submit = false)
 		{
 			if (!$from_submit) {
 				return parent::getPrefixSpecial();
 			}
 
 			return rtrim($this->Prefix . '_' . $this->Special, '_');
 		}
 
 		/**
 		 * Processes tag
 		 *
 		 * @param _BlockTag $tag
 		 * @return string
 		 * @access public
 		 */
 		function ProcessTag(&$tag)
 		{
 			return $this->ProcessParsedTag($tag->Tag, $tag->NP, $tag->getPrefixSpecial());
 		}
 
 		/**
 		 * Checks, that tag is implemented in this tag processor
 		 *
 		 * @param string $tag
 		 * @param string $prefix
 		 *
 		 * @return bool
 		 * @access public
 		 */
 		public function CheckTag($tag, $prefix)
 		{
 			$method = $tag;
 
 			if ( method_exists($this, $method) ) {
 				return true;
 			}
 
 			if ( $this->Application->hasObject('TagsAggregator') ) {
+				/** @var kArray $aggregator */
 				$aggregator = $this->Application->recallObject('TagsAggregator');
-				/* @var $aggregator kArray */
 
 				$tmp = $this->Application->processPrefix($prefix);
 				$tag_mapping = $aggregator->GetArrayValue($tmp['prefix'], $method);
 
 				if ( $tag_mapping ) {
 					return true;
 				}
 			}
 
 			return false;
 		}
 
 		function FormCacheKey($tag, $params, $prefix)
 		{
 			// link tag to it's template
 			$reg_exp = '/^' . preg_quote(FULL_PATH, '/') . '/';
 			$template_path = preg_replace($reg_exp, '', $this->Application->Parser->TempalteFullPath, 1);
 			$element = 'file=' . $template_path . ':' . $prefix . '_' . $tag . '_' . crc32( serialize($params) );
 
 			return $this->Application->Parser->FormCacheKey($element);
 		}
 
 		function ProcessParsedTag($tag, $params, $prefix, $file='unknown', $line=0)
 		{
 			$Method = $tag;
 			if ( method_exists($this, $Method) ) {
 				if ( defined('DEBUG_MODE') && defined('DBG_SHOW_TAGS') && DBG_SHOW_TAGS && $this->Application->isDebugMode() ) {
 					$this->Application->Debugger->appendHTML('Processing PreParsed Tag ' . $Method . ' in ' . $this->Prefix);
 				}
 
 				list ($prefix_only,) = explode('.', $prefix);
 				$this->Application->Parser->PrefixesInUse[$prefix_only] = 1;
 
 				$cache_key = '';
 				$backup_prefix = $this->Prefix;
 				$backup_special = $this->Special;
 
 				if ( $this->Application->Parser->CachingEnabled && array_key_exists('cache_timeout', $params) ) {
 					// individual tag caching
 					$cache_key = $this->FormCacheKey($tag, $params, $prefix);
 					$res = $this->Application->Parser->getCache($cache_key);
 
 					if ( $res !== false ) {
 						return $res;
 					}
 				}
 
 				$original_params = $params;
 				$flag_values = $this->PreparePostProcess($params);
 
 				// pass_params for non ParseBlock tags :)
 				if ( $flag_values['pass_params'] ) {
 					$params = array_merge($this->Application->Parser->Params, $params);
 				}
 
 				$ret = $this->$Method($params);
 
 				$this->Init($backup_prefix, $backup_special);
 
 				$ret = $this->PostProcess($ret, $flag_values);
 
 				if ( $this->Application->Parser->CachingEnabled && $flag_values['cache_timeout'] ) {
 					$this->Application->Parser->setCache($cache_key, $ret, (int)$flag_values['cache_timeout']);
 				}
 
 				return $ret;
 			}
 			else {
 				list ($ret, $tag_found) = $this->processAggregatedTag($tag, $params, $prefix, $file, $line);
 
 				if ( $tag_found ) {
 					return $ret;
 				}
 
 				$error_tag = Array ('file' => $file, 'line' => $line);
 				throw new ParserException('Undefined tag: <strong>' . $prefix . ':' . $tag . '</strong>', 0, null, $error_tag);
 			}
 		}
 
 		function processAggregatedTag($tag, $params, $prefix, $file = 'unknown', $line = 0)
 		{
 			if ( $this->Application->hasObject('TagsAggregator') ) {
 				$Method = $tag;
+
+				/** @var kArray $aggregator */
 				$aggregator = $this->Application->recallObject('TagsAggregator');
-				/* @var $aggregator kArray */
 
 				$tmp = $this->Application->processPrefix($prefix);
 				$tag_mapping = $aggregator->GetArrayValue($tmp['prefix'], $Method);
 
 				if ( $tag_mapping ) {
 					// aggregated tag defined
 					$tmp = $this->Application->processPrefix($tag_mapping[0]);
 					$__tag_processor = $tmp['prefix'] . '_TagProcessor';
 
+					/** @var kTagProcessor $processor */
 					$processor = $this->Application->recallObject($__tag_processor);
-					/* @var $processor kTagProcessor */
 
 					$processor->Init($tmp['prefix'], getArrayValue($tag_mapping, 2) ? $tag_mapping[2] : $tmp['special']);
 
 					$params['original_tag'] = $Method; // allows to define same method for different aggregated tags in same tag processor
 					$params['PrefixSpecial'] = $this->getPrefixSpecial(); // $prefix;
 					$ret = $processor->ProcessParsedTag($tag_mapping[1], $params, $prefix);
 					if ( isset($params['result_to_var']) ) {
 						$this->Application->Parser->SetParam($params['result_to_var'], $ret);
 						$ret = '';
 					}
 					return Array ($ret, true);
 				}
 				else {
 					// aggregated tag not defined
 					$error_tag = Array ('file' => $file, 'line' => $line);
 					throw new ParserException('Undefined aggregated tag <strong>' . $prefix . ':' . $Method . '</strong> (in ' . get_class($this) . ' tag processor)', 0, null, $error_tag);
 				}
 			}
 
 			return Array ('', false);
 		}
 
 		function PreparePostProcess(&$params)
 		{
 			$flags = Array('js_escape', 'equals_to', 'result_to_var', 'pass_params', 'html_escape', 'strip_nl', 'trim', 'cache_timeout');
 			$flag_values = Array();
 
 			foreach ($flags as $flag_name) {
 				$flag_values[$flag_name] = false;
 				if (isset($params[$flag_name])) {
 					$flag_values[$flag_name] = $params[$flag_name];
 					unset($params[$flag_name]);
 				}
 			}
 			return $flag_values;
 		}
 
 		function PostProcess($ret, $flag_values)
 		{
 			if ($flag_values['html_escape']) {
 				$ret = kUtil::escape($ret, kUtil::ESCAPE_HTML);
 			}
 			if ($flag_values['js_escape']) {
 				$ret = kUtil::escape($ret, kUtil::ESCAPE_JS);
 			}
 			if ($flag_values['strip_nl']) {
 				// 1 - strip \r,\n; 2 - strip tabs too
 				$ret = preg_replace($flag_values['strip_nl'] == 2 ? "/[\r\n\t]/" : "/[\r\n]/", '', $ret);
 			}
 			if ($flag_values['trim']) {
 				$ret = trim($ret);
 			}
 			// TODO: in new parser implement this parameter in compiled code (by Alex)
 			if ($flag_values['equals_to'] !== false) {
 				$equals_to = explode('|', $flag_values['equals_to']);
 				$ret = in_array($ret, $equals_to);
 			}
 
 			if ($flag_values['result_to_var']) {
 				$this->Application->Parser->SetParam($flag_values['result_to_var'], $ret);
 				$ret = '';
 			}
 			return $ret;
 		}
 
 
 		/**
 		 * Not tag, method for parameter
 		 * selection from list in this TagProcessor
 		 *
 		 * @param Array $params
 		 * @param string $possible_names
 		 * @return string|bool
 		 * @access protected
 		 */
 		protected function SelectParam($params, $possible_names = null)
 		{
 			if ( !isset($possible_names) ) {
 				// select 1st parameter non-empty parameter value
 				$possible_names = explode(',', $params['possible_names']);
 
 				foreach ($possible_names as $param_name) {
 					$value = $this->Application->Parser->GetParam($param_name);
 					$string_value = (string)$value;
 
 					if ( ($string_value != '') && ($string_value != '0') ) {
 						return $value;
 					}
 				}
 
 				return false;
 			}
 
 			if ( !is_array($possible_names) ) {
 				$possible_names = explode(',', $possible_names);
 			}
 
 			foreach ($possible_names as $name) {
 				if ( isset($params[$name]) ) {
 					return $params[$name];
 				}
 			}
 
 			return false;
 		}
 
 	/**
 	 * Returns templates path for module, which is gathered from prefix module
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @author Alex
 	 */
 	function ModulePath($params)
 	{
 		$force_module = getArrayValue($params, 'module');
 		if ($force_module) {
 			if ($force_module == '#session#') {
 				$force_module = preg_replace('/([^:]*):.*/', '\1', $this->Application->RecallVar('module'));
 				if (!$force_module) $force_module = 'core';
 			}
 			else {
 				$force_module = mb_strtolower($force_module);
 			}
 
 			if ($force_module == 'core') {
 				$module_folder = 'core';
 			}
 			else {
 				$module_folder = trim( $this->Application->findModule('Name', $force_module, 'Path'), '/');
 			}
 		}
 		else {
 			$module_folder = $this->getUnitConfig()->getModuleFolder();
 		}
 
 		return '../../'.$module_folder.'/admin_templates/';
 	}
 }
 
 /*class ProcessorsPool {
 	var $Processors = Array();
 	var $Application;
 	var $Prefixes = Array();
 	var $S;
 
 	function ProcessorsPool()
 	{
 		$this->Application =& KernelApplication::Instance();
 		$this->S =& $this->Application->Session;
 	}
 
 	function RegisterPrefix($prefix, $path, $class)
 	{
 		// echo " RegisterPrefix $prefix, $path, $class <br>";
 		$prefix_item = Array(
 			'path' => $path,
 			'class' => $class
 		);
 		$this->Prefixes[$prefix] = $prefix_item;
 	}
 
 	function CreateProcessor($prefix, &$tag)
 	{
 		// echo " prefix : $prefix <br>";
 		if (!isset($this->Prefixes[$prefix]))
 			$this->Application->ApplicationDie ("<b>Filepath and ClassName for prefix $prefix not defined while processing ".kUtil::escape($tag->GetFullTag())."!</b>");
 		include_once($this->Prefixes[$prefix]['path']);
 		$ClassName = $this->Prefixes[$prefix]['class'];
 		$a_processor = new $ClassName($prefix);
 		$this->SetProcessor($prefix, $a_processor);
 	}
 
 	function SetProcessor($prefix, &$a_processor)
 	{
 		$this->Processors[$prefix] =& $a_processor;
 	}
 
 	function &GetProcessor($prefix, &$tag)
 	{
 		if (!isset($this->Processors[$prefix]))
 			$this->CreateProcessor($prefix, $tag);
 		return $this->Processors[$prefix];
 	}
 }*/
Index: branches/5.3.x/core/kernel/processors/main_processor.php
===================================================================
--- branches/5.3.x/core/kernel/processors/main_processor.php	(revision 16518)
+++ branches/5.3.x/core/kernel/processors/main_processor.php	(revision 16519)
@@ -1,1307 +1,1307 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class kMainTagProcessor extends kTagProcessor {
 
 	public function __construct()
 	{
 		parent::__construct();
 
+		/** @var Params $actions */
 		$actions = $this->Application->recallObject('kActions');
-		/* @var $actions Params */
 
 		$actions->Set('t', $this->Application->GetVar('t'));
 		$actions->Set('sid', $this->Application->GetSID());
 		$actions->Set('m_opener', $this->Application->GetVar('m_opener') );
 	}
 
 	/**
 	 * Base folder for all template includes
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function TemplatesBase($params)
 	{
 		static $cached = Array ();
 
 		$cache_key = crc32( serialize($params) );
 
 		if (!array_key_exists($cache_key, $cached)) {
 			$module = array_key_exists('module', $params) ? $params['module'] : 'core';
 
 			if ($this->Application->isAdmin) {
 				if ($module == 'in-portal') {
 					$module = 'kernel';
 				}
 
 				// remove leading slash + substitute module
 				$module_path = $this->Application->findModule('Name', $module, 'Path');
 
 				if ($module_path !== false) {
 					$path = $module_path . 'admin_templates';
 				}
 				else {
 					// remove leading slash + substitute module
 					$path = preg_replace('/\/(.*?)\/(.*)/', $module . '/\\2', THEMES_PATH);
 				}
 			}
 			else {
 				$path = mb_substr(THEMES_PATH, 1);
 
 				if (mb_strtolower($module) == 'in-portal') {
 					$module_folder = 'platform';
 				}
 				else {
 					$module_folder = $this->Application->findModule('Name', $module, 'TemplatePath');
 				}
 
 				$path .= rtrim('/' . trim($module_folder, '/'), '/') . '/';
 			}
 
 			$cached[$cache_key] = $this->Application->BaseURL() . $path;
 		}
 
 		return $cached[$cache_key];
 	}
 
 	/**
 	 * Creates <base href ..> HTML tag for all templates
 	 * affects future css, js files and href params of links
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 * @see kMainTagProcessor::TemplatesBase
 	 */
 	protected function Base_Ref($params)
 	{
 		// tag TemplatesBase adds trailing "/" but only on Front-End
 		$base_href = rtrim($this->TemplatesBase($params), '/');
 
 		return '<base href="' . $base_href . '/" />';
 	}
 
 	/**
 	 * Returns base url for web-site
 	 *
 	 * @return string
 	 * @access public
 	 */
 	function BaseURL()
 	{
 		return $this->Application->BaseURL();
 	}
 
 	//for compatability with K3 tags
 	function Base($params)
 	{
 		return $this->TemplatesBase($params).'/';
 	}
 
 	function ProjectBase($params)
 	{
 		return $this->Application->BaseURL();
 	}
 
 	/*function Base($params)
 	{
 		return $this->Application->BaseURL().$params['add'];
 	}*/
 
 	/**
 	 * Used to create link to any template.
 	 * use "pass" paramter if "t" tag to specify
 	 * prefix & special of object to be represented
 	 * in resulting url
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access public
 	 */
 	function T($params)
 	{
 		// by default link to current template
 		$template = $this->SelectParam($params, 't,template');
 		$prefix = array_key_exists('prefix', $params) ? $params['prefix'] : '';
 
 		unset($params['t'], $params['template'], $params['prefix']);
 
 		$no_html_escape = false;
 
 		if ( isset($params['no_amp']) ) {
 			$no_html_escape = $params['no_amp'];
 			unset($params['no_amp']);
 		}
 
 		$ret = $this->Application->HREF($template, $prefix, $params);
 
 		if ( !$no_html_escape ) {
 			// most of the time links are placed into HTML document
 			// TODO: in future always do escaping according to current "escape context"
 			$ret = kUtil::escape($ret, kUtil::ESCAPE_HTML);
 		}
 
 		return $ret;
 	}
 
 	function Link($params)
 	{
 		// pass "m" prefix, instead of "all", that is by default on Front-End
 		if (!array_key_exists('pass', $params)) {
 			$params['pass'] = 'm';
 		}
 
 		return $this->T($params);
 	}
 
 	/**
 	 * Performs redirect to provided template/url
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function Redirect($params)
 	{
 		// By default link to current template.
 		$template = $this->SelectParam($params, 't,template');
 		$prefix = array_key_exists('prefix', $params) ? $params['prefix'] : '';
 
 		unset($params['t'], $params['template'], $params['prefix']);
 
 		// Pass "m" prefix, instead of "all", that is by default on Front-End.
 		if ( !array_key_exists('pass', $params) ) {
 			$params['pass'] = 'm';
 		}
 
 		$this->Application->Redirect($template, $params, $prefix);
 
 		return '';
 	}
 
 	/*function Env($params)
 	{
 		$t = $params['template'];
 		unset($params['template']);
 		return $this->Application->BuildEnv($t, $params, 'm', false, false);
 	}*/
 
 	function FormAction($params)
 	{
 		if (!array_key_exists('pass', $params)) {
 			$params['pass'] = 'all,m';
 		}
 
 		$params['pass_category'] = 1;
 
 		return $this->Application->HREF('', '', $params);
 	}
 
 	/*// NEEDS TEST
 	function Config($params)
 	{
 		return $this->Application->ConfigOption($params['var']);
 	}
 
 	function Object($params)
 	{
 		$name = $params['name'];
 		$method = $params['method'];
 
 		$tmp = $this->Application->recallObject($name);
 		if ($tmp != null) {
 			if (method_exists($tmp, $method))
 				return $tmp->$method($params);
 			else
 				echo "Method $method does not exist in object ".get_class($tmp)." named $name<br>";
 		}
 		else
 			echo "Object $name does not exist in the appliaction<br>";
 	}*/
 
 	/**
 	 * Tag, that always returns true.
 	 * For parser testing purposes
 	 *
 	 * @param Array $params
 	 * @return bool
 	 * @access public
 	 */
 	function True($params)
 	{
 		return true;
 	}
 
 	/**
 	 * Tag, that always returns false.
 	 * For parser testing purposes
 	 *
 	 * @param Array $params
 	 * @return bool
 	 * @access public
 	 */
 	function False($params)
 	{
 		return false;
 	}
 
 	/**
 	 * Returns block parameter by name (used only as "check" parameter value for "m_if" tag!)
 	 *
 	 * @param Array $params
 	 * @return stirng
 	 * @access public
 	 */
 	function Param($params)
 	{
 		$name = $params['name'];
 
 		if (array_key_exists($name, $this->Application->Parser->Captures)) {
 			$capture_params = $params;
 			$capture_params['name'] = '__capture_' . $name;
 
 			$this->Application->Parser->SetParam($name, $this->Application->ParseBlock($capture_params));
 		}
 
 		$res = $this->Application->Parser->GetParam($name);
 
 		if ($res === false) {
 			$res = '';
 		}
 
 		if (array_key_exists('plus', $params)) {
 			$res += $params['plus'];
 		}
 
 		return $res;
 	}
 
 	/**
 	 * Compares block parameter with value specified
 	 *
 	 * @param Array $params
 	 * @return bool
 	 * @access public
 	 */
 	function ParamEquals($params)
 	{
 		$name = $this->SelectParam($params, 'name,var,param');
 		$value = $params['value'];
 
 		return ($this->Application->Parser->GetParam($name) == $value);
 	}
 
 	/*function PHP_Self($params)
 	{
 		return $HTTP_SERVER_VARS['PHP_SELF'];
 	}
 	*/
 
 	/**
 	 * Returns session variable value by name
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access public
 	 */
 	function Recall($params)
 	{
 		$var_name = $this->SelectParam($params,'name,var,param');
 
 		if (isset($params['persistent']) && $params['persistent']) {
 			$ret = $this->Application->RecallPersistentVar($var_name);
 		}
 		else {
 			 $ret = $this->Application->RecallVar($var_name);
 		}
 
 		$ret = ($ret === false && isset($params['no_null'])) ? '' : $ret;
 		if (getArrayValue($params, 'special') || getArrayValue($params, 'htmlchars')) {
 			$ret = kUtil::escape($ret, kUtil::ESCAPE_HTML);
 		}
 
 		if (getArrayValue($params, 'urlencode')) {
 			$ret = kUtil::escape($ret, kUtil::ESCAPE_URL);
 		}
 
 		return $ret;
 	}
 
 	function RemoveVar($params)
 	{
 		$this->Application->RemoveVar( $this->SelectParam($params,'name,var,param') );
 	}
 
 	// bad style to store something from template to session !!! (by Alex)
 	// Used here only to test how session works, nothing more
 	function Store($params)
 	{
 		//echo"Store $params[name]<br>";
 		$name = $params['name'];
 		$value = $params['value'];
 		$this->Application->StoreVar($name,$value);
 	}
 
 	/**
 	 * Links variable from request with variable from session
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function LinkVar($params)
 	{
 		$var_name = $params['name'];
 		$session_var_name = isset($params['session_name']) ? $params['session_name'] : $var_name;
 		$default_value = isset($params['default']) ? $params['default'] : '';
 
 		$this->Application->LinkVar($var_name, $session_var_name, $default_value);
 
 		return '';
 	}
 
 	/**
 	 * Links variable from request with variable from session and returns it's value
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function GetLinkedVar($params)
 	{
 		$this->LinkVar($params);
 
 		return $this->Application->GetVar( $params['name'] );
 	}
 
 	/**
 	 * Sets application variable value(-s)
 	 *
 	 * @param Array $params
 	 * @access public
 	 */
 	function Set($params)
 	{
 		foreach ($params as $param => $value) {
 			$this->Application->SetVar($param, $value);
 		}
 	}
 
 	/**
 	 * Increment application variable
 	 * specified by number specified
 	 *
 	 * @param Array $params
 	 * @access public
 	 */
 	function Inc($params)
 	{
 		$this->Application->SetVar($params['param'], $this->Application->GetVar($params['param']) + $params['by']);
 	}
 
 	/**
 	 * Retrieves application variable
 	 * value by name
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access public
 	 */
 	function Get($params)
 	{
 		$name = $this->SelectParam($params, 'name,var,param');
 
 		if ( strpos($name, '[') !== false ) {
 			preg_match('/([^\[\]]+)\[(.*)\]/', $name, $regs);
 
 			$function_params = explode('][', $regs[2]);
 			$ret = $this->Application->GetVar($regs[1], array());
 			kUtil::array_unshift_ref($function_params, $ret);
 
 			$ret = call_user_func_array('getArrayValue', $function_params);
 		}
 		else {
 			$ret = $this->Application->GetVar($name, '');
 		}
 
 		if ( array_key_exists('no_html_escape', $params) && $params['no_html_escape'] ) {
 			return $this->Application->isAdmin ? $ret : kUtil::unescape($ret, kUtil::ESCAPE_HTML);
 		}
 
 		return kUtil::escape($ret, kUtil::ESCAPE_HTML);
 	}
 
 	/**
 	 * Retrieves application constant
 	 * value by name
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access public
 	 */
 	function GetConst($params)
 	{
 		$constant_name = $this->SelectParam($params, 'name,const');
 
 		return defined($constant_name) ? constant($constant_name) : '';
 	}
 
 	/**
 	 * Retrieves configuration variable value by name
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access public
 	 */
 	function GetConfig($params)
 	{
 		$config_name = $this->SelectParam($params, 'name,var');
 		$ret = $this->Application->ConfigValue($config_name);
 
 		if ( isset($params['formatted']) && $params['formatted'] ) {
 			$sql = 'SELECT ValueList
 					FROM ' . TABLE_PREFIX . 'SystemSettings
 					WHERE VariableName = ' . $this->Conn->qstr($config_name) . ' AND ElementType IN ("select", "radio")';
 			$value_list = $this->Conn->GetOne($sql);
 
 			if ( $value_list ) {
+				/** @var InpCustomFieldsHelper $helper */
 				$helper = $this->Application->recallObject('InpCustomFieldsHelper');
-				/* @var $helper InpCustomFieldsHelper */
 
 				$options = $helper->GetValuesHash($value_list);
 				$ret = isset($options[$ret]) ? $options[$ret] : $ret;
 			}
 		}
 
 		if ( isset($params['as_label']) && $params['as_label'] ) {
 			$ret = $this->Application->Phrase($ret);
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Compares configuration variable to a given value
 	 *
 	 * @param Array $params
 	 * @return bool
 	 * @deprecated
 	 * @access protected
 	 */
 	protected function ConfigEquals($params)
 	{
 		$option = $this->SelectParam($params, 'name,option,var');
 
 		return $this->Application->ConfigValue($option) == $params['value'];
 	}
 
 	/**
 	 * Creates all hidden fields
 	 * needed for kernel_form
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function DumpSystemInfo($params)
 	{
+		/** @var Params $actions */
 		$actions = $this->Application->recallObject('kActions');
-		/* @var $actions Params */
 
 		$actions->Set('t', $this->Application->GetVar('t'));
 
 		$o = '';
 		$params = $actions->GetParams();
 
 		foreach ($params AS $name => $val) {
 			$o .= "<input type='hidden' name='$name' id='$name' value='$val'>\n";
 		}
 
 		return $o;
 	}
 
 	/**
 	 * Used for search sidebox on front-end only
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function GetFormHiddens($params)
 	{
 		$t = $this->SelectParam($params, 'template,t');
 		unset($params['template']);
 
 		$form_fields = Array ();
 		if ( $this->Application->RewriteURLs() ) {
+			/** @var Session $session */
 			$session = $this->Application->recallObject('Session');
-			/* @var $session Session */
 
 			if ( $session->NeedQueryString() ) {
 				$form_fields['sid'] = $this->Application->GetSID();
 			}
 		}
 		else {
 			$form_fields['env'] = $this->Application->BuildEnv($t, $params, 'm', false, false);
 		}
 
 		if ( $this->Application->GetVar('admin') == 1 ) {
 			$form_fields['admin'] = 1;
 		}
 
 		$ret = '';
 		$field_tpl = '<input type="hidden" name="%1$s" id="%1$s" value="%2$s"/>' . "\n";
 		foreach ($form_fields as $form_field => $field_value) {
 			$ret .= sprintf($field_tpl, $form_field, $field_value);
 		}
 
 		return $ret;
 	}
 
 	function Odd_Even($params)
 	{
 		$odd = $params['odd'];
 		$even = $params['even'];
 		if (!isset($params['var'])) {
 			$var = 'odd_even';
 		}
 		else {
 			$var = $params['var'];
 		}
 
 		if ($this->Application->GetVar($var) == 'even') {
 			if (!isset($params['readonly']) || !$params['readonly']) {
 				$this->Application->SetVar($var, 'odd');
 			}
 			return $even;
 		}
 		else {
 			if (!isset($params['readonly']) || !$params['readonly']) {
 				$this->Application->SetVar($var, 'even');
 			}
 			return $odd;
 		}
 	}
 
 	/**
 	 * Returns phrase translation by name
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access public
 	 */
 	function Phrase($params)
 	{
 		$phrase_name = $this->SelectParam($params, 'label,name,title');
 		$default_translation = $this->SelectParam($params, 'default');
 
 		$no_editing = isset($params['no_editing']) && $params['no_editing'];
 		$translation = $this->Application->Phrase($phrase_name, !$no_editing);
 
 		$phrase_key = mb_strtoupper($phrase_name);
 
 		if ( $default_translation && strpos($translation, '!' . $phrase_key . '!') !== false ) {
+			/** @var kDBItem $phrase */
 			$phrase = $this->Application->recallObject('phrases.autocreate', null, Array ('skip_autoload' => true));
-			/* @var $phrase kDBItem */
 
 			if ( !$phrase->Load($phrase_key, 'PhraseKey') ) {
 				$phrase->SetDBField('Phrase', $phrase_name);
 
+				/** @var kMultiLanguageHelper $ml_helper */
 				$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
-				/* @var $ml_helper kMultiLanguageHelper */
 
 				$languages = $ml_helper->getLanguages();
 
 				foreach ($languages AS $language_id) {
 					$phrase->SetDBField('l' . $language_id . '_Translation', $default_translation);
 				}
 
 				if ( $phrase->Create() ) {
 					$translation = $default_translation;
 				}
 			}
 		}
 
 		if ( isset($params['escape']) && $params['escape'] ) {
 			// html escaping here is redundant
 			$translation = kUtil::escape($translation, kUtil::ESCAPE_JS);
 		}
 
 		return $translation;
 	}
 
 	// for tabs
 	function is_active($params)
 	{
 		$test_templ = $this->SelectParam($params, 'templ,template,t');
 		if ( !getArrayValue($params, 'allow_empty') ) {
 			$if_true = getArrayValue($params, 'true') ? $params['true'] : 1;
 			$if_false = getArrayValue($params, 'false') ? $params['false'] : 0;
 		}
 		else {
 			$if_true = $params['true'];
 			$if_false = $params['false'];
 		}
 
 		$physical_template = $this->Application->getPhysicalTemplate($this->Application->GetVar('t'));
 
 		return preg_match('/^' . str_replace('/', '\/', $test_templ) . '/i', $physical_template) ? $if_true : $if_false;
 	}
 
 	function IsNotActive($params)
 	{
 		return !$this->is_active($params);
 	}
 
 	function IsActive($params)
 	{
 		return $this->is_active($params);
 	}
 
 	function is_t_active($params)
 	{
 		return $this->is_active($params);
 	}
 
 	function CurrentTemplate($params)
 	{
 		return $this->is_active($params);
 	}
 
 	/**
 	 * Checks if session variable
 	 * specified by name value match
 	 * value passed as parameter
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access public
 	 */
 	function RecallEquals($params)
 	{
 		$name = $this->SelectParam($params, 'name,var');
 		$value = $params['value'];
 
 		if (isset($params['persistent']) && $params['persistent']) {
 			return $this->Application->RecallPersistentVar($name) == $value;
 		}
 
 		return ($this->Application->RecallVar($name) == $value);
 	}
 
 	/**
 	 * Checks if application variable specified by name value match value passed as parameter
 	 *
 	 * @param Array $params
 	 * @return bool
 	 * @access protected
 	 * @deprecated
 	 */
 	protected function GetEquals($params)
 	{
 		$name = $this->SelectParam($params, 'var,name,param');
 
 		return $this->Application->GetVar($name) == $params['value'];
 	}
 
 	function ModuleInclude($params)
 	{
 		$ret = '';
 		$included = Array ();
 		$block_params = array_merge($params, Array ('is_silent' => 2)); // don't make fatal errors in case if template is missing
 		$current_template = $this->Application->GetVar('t');
 
 		$replace_main = isset($params['replace_m']) && $params['replace_m'];
 		$skip_prefixes = isset($params['skip_prefixes']) ? explode(',', $params['skip_prefixes']) : Array ();
 		$cms_mode = $this->Application->GetVar('admin');
 
 		foreach ($this->Application->ModuleInfo as $module_name => $module_data) {
 			$module_key = mb_strtolower($module_name);
 
 			if ( $module_name == 'In-Portal' ) {
 				if ( !$cms_mode && $this->Application->isAdmin ) {
 					// don't process In-Portal templates in admin
 					continue;
 				}
 
 				// Front-End still relies on In-Portal module
 				$module_prefix = $module_data['TemplatePath'];
 			}
 			elseif ( $this->Application->isAdmin && $module_data['Path'] != 'core/' ) {
 				$module_prefix = $module_key . '/'; // was $module_data['Path'];
 			}
 			else {
 				$module_prefix = $module_data['TemplatePath']; // always have trailing "/"
 			}
 
 			if ( in_array($module_prefix, $included) ) {
 				// template by this path was already included by other module (e.g. in-portal used core's template)
 				continue;
 			}
 
 			$block_params['t'] = $module_prefix . $this->SelectParam($params, $module_key . '_template,' . $module_key . '_t,template,t');
 
 			$check_prefix = $module_data['Var'];
 
 			if ( $check_prefix == 'adm' && $replace_main ) {
 				$check_prefix = 'c';
 			}
 
 			if ( $block_params['t'] == $current_template || in_array($check_prefix, $skip_prefixes) ) {
 				continue;
 			}
 
 			$no_data = $this->SelectParam($params, $module_key . '_block_no_data,block_no_data');
 			if ( $no_data ) {
 				$block_params['block_no_data'] = $module_prefix . '/' . $no_data;
 			}
 
 			$ret .= $this->Application->IncludeTemplate($block_params);
 			$included[] = $module_prefix;
 		}
 
 		return $ret;
 	}
 
 	function ModuleEnabled($params)
 	{
 		return $this->Application->isModuleEnabled( $params['module'] );
 	}
 
 	/**
 	 * Checks if debug mode is on
 	 *
 	 * @param Array $params
 	 * @return bool
 	 * @access public
 	 */
 	function IsDebugMode($params)
 	{
 		return defined('DEBUG_MODE') && $this->Application->isDebugMode();
 	}
 
 	/*function MassParse($params)
 	{
 		$qty = $params['qty'];
 		$block = $params['block'];
 		$mode = $params['mode'];
 
 		$o = '';
 		if ($mode == 'func') {
 			$func = create_function('$params', '
 					$o = \'<tr>\';
 					$o.= \'<td>a\'.$params[\'param1\'].\'</td>\';
 					$o.= \'<td>a\'.$params[\'param2\'].\'</td>\';
 					$o.= \'<td>a\'.$params[\'param3\'].\'</td>\';
 					$o.= \'<td>a\'.$params[\'param4\'].\'</td>\';
 					$o.= \'</tr>\';
 					return $o;
 				');
 			for ($i=1; $i<$qty; $i++) {
 				$block_params['param1'] = rand(1, 10000);
 				$block_params['param2'] = rand(1, 10000);
 				$block_params['param3'] = rand(1, 10000);
 				$block_params['param4'] = rand(1, 10000);
 				$o .= $func($block_params);
 			}
 			return $o;
 		}
 
 		$block_params['name'] = $block;
 
 		for ($i=0; $i<$qty; $i++) {
 			$block_params['param1'] = rand(1, 10000);
 			$block_params['param2'] = rand(1, 10000);
 			$block_params['param3'] = rand(1, 10000);
 			$block_params['param4'] = rand(1, 10000);
 			$block_params['passed'] = $params['passed'];
 			$block_params['prefix'] = 'm';
 
 			$o.= $this->Application->ParseBlock($block_params);
 		}
 		return $o;
 	}*/
 
 	function LoggedIn($params)
 	{
 		return $this->Application->LoggedIn();
 	}
 
 	/**
 	 * Allows to check if permission exists directly in template and perform additional actions if required
 	 *
 	 * @param Array $params
 	 * @return bool
 	 */
 	function CheckPermission($params)
 	{
+		/** @var kPermissionsHelper $perm_helper */
 		$perm_helper = $this->Application->recallObject('PermissionsHelper');
-		/* @var $perm_helper kPermissionsHelper */
 
 		return $perm_helper->TagPermissionCheck($params);
 	}
 
 	/**
 	 * Checks if user is logged in and if not redirects it to template passed
 	 *
 	 * @param Array $params
 	 */
 	function RequireLogin($params)
 	{
 		$t = $this->Application->GetVar('t');
 		$next_t = getArrayValue($params, 'next_template');
 
 		if ( $next_t ) {
 			$t = $next_t;
 		}
 
 		// check by permissions: begin
 		if ((isset($params['perm_event']) && $params['perm_event']) ||
 			(isset($params['perm_prefix']) && $params['perm_prefix']) ||
 			(isset($params['permissions']) && $params['permissions'])) {
 
+			/** @var kPermissionsHelper $perm_helper */
 			$perm_helper = $this->Application->recallObject('PermissionsHelper');
-			/* @var $perm_helper kPermissionsHelper */
 
 			$perm_status = $perm_helper->TagPermissionCheck($params);
 			if (!$perm_status) {
 				list($redirect_template, $redirect_params) = $perm_helper->getPermissionTemplate($params);
 				$this->Application->Redirect($redirect_template, $redirect_params);
 			}
 			else {
 				return ;
 			}
 		}
 		// check by permissions: end
 
 		// check by configuration value: begin
 		$condition = getArrayValue($params, 'condition');
 		if (!$condition) {
 			$condition = true;
 		}
 		else {
 			if (substr($condition, 0, 1) == '!') {
 				$condition = !$this->Application->ConfigValue(substr($condition, 1));
 			}
 			else {
 				$condition = $this->Application->ConfigValue($condition);
 			}
 		}
 		// check by configuration value: end
 
 		// check by belonging to group: begin
 		$group = $this->SelectParam($params, 'group');
 		$group_access = true;
 		if ($group) {
 			$sql = 'SELECT GroupId
 					FROM '.TABLE_PREFIX.'UserGroups
 					WHERE Name = '.$this->Conn->qstr($group);
 			$group_id = $this->Conn->GetOne($sql);
 
 			if ($group_id) {
 				$groups = explode(',', $this->Application->RecallVar('UserGroups'));
 				$group_access = in_array($group_id, $groups);
 			}
 		}
 		// check by belonging to group: end
 
 		if ((!$this->Application->LoggedIn() || !$group_access) && $condition) {
 			$redirect_params = $this->Application->HttpQuery->getRedirectParams(true);
 
 			if (MOD_REWRITE) {
 				// TODO: $next_t variable is ignored !!! (is anyone using m_RequireLogin tag with "next_template" parameter?)
 				$redirect_params = Array (
 					'm_cat_id' => 0,
 					'next_template' => 'external:' . $_SERVER['REQUEST_URI'],
 				);
 			}
 			else {
 				$redirect_params['next_template'] = $t;
 			}
 
 			if (array_key_exists('pass_category', $params)) {
 				$redirect_params['pass_category'] = $params['pass_category'];
 			}
 
 			if (array_key_exists('use_section', $params)) {
 				$redirect_params['use_section'] = $params['use_section'];
 			}
 
 			if ( $this->Application->LoggedIn() && !$group_access) {
 				$this->Application->Redirect($params['no_group_perm_template'], $redirect_params);
 			}
 
 			$this->Application->Redirect($params['login_template'], $redirect_params);
 		}
 	}
 
 	/**
 	 * Checks, that user belongs to a group with a given name
 	 *
 	 * @param Array $params
 	 * @return bool
 	 */
 	protected function IsMember($params)
 	{
 		$sql = 'SELECT GroupId
 				FROM ' . TABLE_PREFIX . 'UserGroups
 				WHERE Name = ' . $this->Conn->qstr($params['group']);
 		$group_id = $this->Conn->GetOne($sql);
 
 		if ( $group_id ) {
 			$groups = explode(',', $this->Application->RecallVar('UserGroups'));
 
 			return in_array($group_id, $groups);
 		}
 
 		return false;
 	}
 
 	/**
 	 * Checks if SSL is enabled and redirects to SSL Domain if needed
 	 * If SSLDomain is not defined in config - the tag does not do anything
 	 * If for_logged_in_only="1" exits if user is not logged in.
 	 * If called without params forces https right away. If called with by_config="1" checks the
 	 * Require SSL setting from General Config and if it is ON forces https
 	 *
 	 * @param Array $params
 	 */
 	protected function CheckSSL($params)
 	{
 		$ssl_domain = $this->Application->getSecureDomain();
 
 		if ( !$ssl_domain || ($this->Application->TemplatesCache->forceThemeName !== false) ) {
 			// SSL URL is not set - no way to require SSL
 			// internal parsing (e.g. "TemplateParser::_parseTemplate") -> don't redirect
 			return;
 		}
 
 		$require = false;
 
 		if ( isset($params['mode']) && $params['mode'] == 'required' ) {
 			$require = true;
 			if ( isset($params['for_logged_in_only']) && $params['for_logged_in_only'] && !$this->Application->LoggedIn() ) {
 				$require = false;
 			}
 
 			if ( isset($params['condition']) ) {
 				if ( !$this->Application->ConfigValue($params['condition']) ) {
 					$require = false;
 				}
 			}
 		}
 
 		if ( EDITING_MODE ) {
 			// match SSL mode on front-end to one in administrative console, when browse modes are used
 			$require = $this->Application->ConfigValue('Require_AdminSSL');
 		}
 
+		/** @var kHTTPQuery $http_query */
 		$http_query = $this->Application->recallObject('kHTTPQuery');
-		/* @var $http_query kHTTPQuery */
 
 		$pass = $http_query->getRedirectParams();
 		$pass['pass_events'] = 1; // to make sure all events are passed when redirect happens
 
 		if ( $require ) {
 			if ( PROTOCOL == 'https://' ) {
 				$this->Application->SetVar('__KEEP_SSL__', 1);
 				return;
 			}
 
 			$pass['__SSL__'] = 1;
 			$this->Application->Redirect('', $pass);
 		}
 		else {
 			if ( PROTOCOL == 'https://' && $this->Application->ConfigValue('Force_HTTP_When_SSL_Not_Required') ) {
 				if ( $this->Application->GetVar('__KEEP_SSL__') ) {
 					return;
 				}
 
 				// $pass_more = Array ('pass' => 'm', 'm_cat_id' => 0, '__SSL__' => 0);
 				$pass['__SSL__'] = 0;
 				$this->Application->Redirect('', $pass); // $pass_more
 			}
 		}
 	}
 
 	function ConstOn($params)
 	{
 		$name = $this->SelectParam($params,'name,const');
 		return kUtil::constOn($name);
 	}
 
 	function SetDefaultCategory($params)
 	{
 		$category_id = $this->Application->findModule('Name', $params['module'], 'RootCat');
 		$this->Application->SetVar('m_cat_id', $category_id);
 	}
 
 	function XMLTemplate($params)
 	{
 		$this->NoDebug($params);
 
 		if ( isset($params['cache']) && $params['cache'] ) {
 			$nextyear = intval(date('Y') + 1);
 
 			$format = "D, d M Y H:i:s";
 			$expiration = gmdate($format, time() + $params['cache']) . ' GMT';
 			$last_modified = time();
 
 			header('Cache-Control: public, cache, max-age=' . $params['cache']);
 			header("Expires: $expiration");
 			header('Pragma: public');
 
 			// Getting headers sent by the client.
 			$headers = $this->Application->HttpQuery->getHeaders();
 
 			// Checking if the client is validating his cache and if it is current.
 			if ( isset($headers['If-Modified-Since']) && (strtotime($headers['If-Modified-Since']) > $last_modified - $params['cache']) ) {
 				// Client's cache IS current, so we just respond '304 Not Modified'.
 				header('Last-Modified: ' . date($format, strtotime($headers['If-Modified-Since'])) . ' GMT', true, 304);
 				exit;
 			}
 			else {
 				// Image not cached or cache outdated, we respond '200 OK' and output the image.
 				header('Last-Modified: ' . gmdate($format, $last_modified) . ' GMT', true, 200);
 			}
 		}
 
 		// xml documents are usually long
 		kUtil::setResourceLimit();
 
 		if ( !$this->Application->GetVar('debug') ) {
 			return $this->Application->XMLHeader(getArrayValue($params, 'xml_version'));
 		}
 
 		return '';
 	}
 
 	function Header($params)
 	{
 		header($params['data']);
 	}
 
 	function NoDebug($params)
 	{
 		if ( !$this->Application->GetVar('debug') ) {
 			kUtil::safeDefine('DBG_SKIP_REPORTING', 1);
 		}
 	}
 
 	/**
 	 * Returns Home category name
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @deprecated
 	 */
 	function RootCategoryName($params)
 	{
 		$no_editing = array_key_exists('no_editing', $params) && $params['no_editing'];
 
 		return $this->Application->Phrase('la_rootcategory_name', !$no_editing);
 	}
 
 	/**
 	 * Allows to attach file directly from email event template
 	 *
 	 * @param Array $params
 	 */
 	function AttachFile($params)
 	{
 		$path = FULL_PATH . '/' . $params['path'];
 		$pseudo = isset($params['special']) ? 'EmailSender.' . $params['special'] : 'EmailSender';
 
+		/** @var kEmailSendingHelper $esender */
 		$esender = $this->Application->recallObject($pseudo);
-		/* @var $esender kEmailSendingHelper */
 
 		if ( file_exists($path) && is_file($path) ) {
 			$esender->AddAttachment($path);
 		}
 	}
 
 	function CaptchaImage($params)
 	{
 		$this->NoDebug($params);
 		$this->Application->SetVar('skip_last_template', 1);
 
+		/** @var kCaptchaHelper $captcha_helper */
 		$captcha_helper = $this->Application->recallObject('CaptchaHelper');
-		/* @var $captcha_helper kCaptchaHelper */
 
 		// generate captcha code
 		$code = $captcha_helper->prepareCode( $this->Application->GetVar('var') );
 
 		$captcha_helper->GenerateCaptchaImage($code, $this->Application->GetVar('w'), $this->Application->GetVar('h'), true);
 	}
 
 	function SID($params)
 	{
 		return $this->Application->GetSID();
 	}
 
 	function ModuleInfo($params)
 	{
 		return $this->Application->findModule($params['key'], $params['value'], $params['return']);
 	}
 
 	function Random($params)
 	{
 		return rand(1, 100000000);
 	}
 
 	/**
 	 * Prints parser params, available at current deep level
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function PrintCurrentParams($params)
 	{
 		$current_params = $this->Application->Parser->Params;
 
 		foreach ($current_params as $param_name => $param_value) {
 			if ( is_object($param_value) && !method_exists($param_value, '__toString') ) {
 				$param_value = 'ClassName: ' . get_class($param_value);
 			}
 
 			$current_params[$param_name] = $param_name . ' = "' . $param_value . '"';
 		}
 
 		return '<pre>' . implode("\n", $current_params) . '</pre>';
 	}
 
 	/**
 	 * Gets previously defined counter result
 	 *
 	 * @param Array $params
 	 * @return int
 	 */
 	function GetCounter($params)
 	{
 		return $this->Application->getCounter($params['name'], $params);
 	}
 
 	/**
 	 * Increments PageHit counter
 	 *
 	 * @param Array $params
 	 * @return int
 	 */
 	function RegisterPageHit($params)
 	{
 		if ($this->Application->ConfigValue('UsePageHitCounter')) {
 			// get current counte
 			$sql = 'SELECT VariableValue
 					FROM '.TABLE_PREFIX.'SystemSettings
 					WHERE VariableName = "PageHitCounter"';
 			$page_counter = (int)$this->Conn->GetOne($sql);
 
 			$sql = 'UPDATE LOW_PRIORITY '.TABLE_PREFIX.'SystemSettings
 					SET VariableValue = '.($page_counter + 1).'
 					WHERE VariableName = "PageHitCounter"';
 			$this->Conn->Query($sql);
 		}
 	}
 
 	function Timestamp($params)
 	{
 		$format = isset($params['format']) ? $params['format'] : 'd.m.Y H:i:s';
 		return date($format);
 	}
 
 	function GetUrlHiddenFileds($params)
 	{
 		$vars = Array ('page', 'per_page', 'sort_by');
 		$ret = '<input type="hidden" name="main_list" value="1"/>';
 
 		if (array_key_exists('skip', $params)) {
 			$vars = array_diff($vars, $params['skip']);
 		}
 
 		foreach ($vars as $var_name) {
 			$var_value = $this->Application->GetVar($var_name);
 
 			if ($var_value) {
 				$ret .= '<input type="hidden" name="' . $var_name . '" value="' . $var_value . '"/>';
 			}
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Returns current Page URL (without re-assembling it).
 	 * "skip_query" param is optional and will remove the ?QUERY part from the result.
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function CurrentPageLink($params)
 	{
 		if ( isset($params['skip_query']) && $params['skip_query'] ) {
 			return preg_replace('/\?' . preg_quote($_SERVER['QUERY_STRING'], '/') . '$/', '', $_SERVER['REQUEST_URI']);
 		}
 
 		return $_SERVER['REQUEST_URI'];
 	}
 
 	/**
 	 * Returns current maintenance mode state
 	 *
 	 * @param Array $params
 	 * @return int
 	 * @access protected
 	 */
 	protected function MaintenanceMode($params)
 	{
 		$check_ips = isset($params['check_ips']) ? $params['check_ips'] : true;
 
 		return $this->Application->getMaintenanceMode($check_ips);
 	}
 
 	/**
 	 * Checks if element with given name is defined
 	 *
 	 * @param Array $params
 	 * @return int
 	 * @access protected
 	 */
 	protected function ElementDefined($params)
 	{
 		return $this->Application->Parser->blockFound($params['name']);
 	}
 
 	/**
 	 * Detects mobile browser.
 	 *
 	 * @param array $params
 	 *
 	 * @return string
 	 * @link   http://detectmobilebrowsers.com/
 	 */
 	protected function IsMobileBrowser($params)
 	{
 		$user_agent = $_SERVER['HTTP_USER_AGENT'];
 
 		if ( preg_match('/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i', $user_agent) || preg_match('/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i', substr($user_agent, 0, 4)) ) {
 			return true;
 		}
 
 		return false;
 	}
 
 }
Index: branches/5.3.x/core/kernel/utility/Router/AbstractCategoryItemRouter.php
===================================================================
--- branches/5.3.x/core/kernel/utility/Router/AbstractCategoryItemRouter.php	(revision 16518)
+++ branches/5.3.x/core/kernel/utility/Router/AbstractCategoryItemRouter.php	(revision 16519)
@@ -1,266 +1,266 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2015 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 abstract class AbstractCategoryItemRouter extends AbstractRouter
 {
 
 	/**
 	 * Builds url part.
 	 *
 	 * @return boolean Return true to continue to next router; return false not to rewrite given prefix.
 	 */
 	protected function build()
 	{
 		static $default_per_page = array();
 
 		$ret = '';
 		$build_params = $this->extractBuildParams();
 
 		if ( $build_params === false ) {
 			return '';
 		}
 
 		$this->keepEvent();
 		list ($prefix) = explode('.', $this->buildPrefix);
 
 		if ( !array_key_exists($prefix, $default_per_page) ) {
+			/** @var ListHelper $list_helper */
 			$list_helper = $this->Application->recallObject('ListHelper');
-			/* @var $list_helper ListHelper */
 
 			$default_per_page[$prefix] = $list_helper->getDefaultPerPage($prefix);
 		}
 
 		if ( $build_params[$this->buildPrefix . '_id'] ) {
 			$category_id = $this->getBuildParam('m_cat_id');
 
 			// If template is also item template of category, then remove template.
 			$template = $this->getBuildParam('t', false);
 			$item_template = $this->getUrlProcessor()->GetItemTemplate($category_id, $prefix);
 
 			if ( $template == $item_template || strtolower($template) == '__default__' ) {
 				// Given template is also default template for this category item or '__default__' given.
 				$this->setBuildParam('pass_template', false);
 			}
 
 			// Get item's filename.
 			if ( $prefix == 'bb' ) {
 				$ret .= 'bb_' . $build_params[$this->buildPrefix . '_id'] . '/';
 			}
 			else {
 				$filename = $this->getFilename($prefix, $build_params[$this->buildPrefix . '_id'], $category_id);
 
 				if ( $filename !== false ) {
 					$ret .= $filename . '/';
 				}
 			}
 		}
 		else {
 			if ( $build_params[$this->buildPrefix . '_Page'] == 1 ) {
 				// When printing category items and we are on the 1st page -> there is no information about
 				// category item prefix and $params['pass_category'] will not be added automatically.
 				$this->setBuildParam('pass_category', true);
 			}
 			elseif ( $build_params[$this->buildPrefix . '_Page'] > 1 ) {
 				$this->setBuildParam('page', $build_params[$this->buildPrefix . '_Page']);
 			}
 
 			$per_page = $build_params[$this->buildPrefix . '_PerPage'];
 
 			if ( $per_page && ($per_page != $default_per_page[$prefix]) ) {
 				$this->setBuildParam('per_page', $build_params[$this->buildPrefix . '_PerPage']);
 			}
 		}
 
 		return mb_strtolower(rtrim($ret, '/'));
 	}
 
 	/**
 	 * Parses url part.
 	 *
 	 * @param array $url_parts Url parts to parse.
 	 * @param array $params    Parameters, that are used for url building or created during url parsing.
 	 *
 	 * @return boolean Return true to continue to next router; return false to stop processing at this router.
 	 */
 	public function parse(array &$url_parts, array &$params)
 	{
 		$module_prefix = $this->parseCategoryItemUrl($url_parts, $params);
 
 		if ( $module_prefix !== false ) {
 			$params['pass'][] = $module_prefix;
 			$this->getUrlProcessor()->setModulePrefix($module_prefix);
 		}
 
 		return true;
 	}
 
 	/**
 	 * Returns item's filename that corresponds id passed. If possible, then get it from cache.
 	 *
 	 * @param string  $prefix      Prefix.
 	 * @param integer $id          Id.
 	 * @param integer $category_id Category Id.
 	 *
 	 * @return string
 	 */
 	protected function getFilename($prefix, $id, $category_id = null)
 	{
 		$category_id = isset($category_id) ? $category_id : $this->Application->GetVar('m_cat_id');
 
 		$serial_name = $this->Application->incrementCacheSerial($prefix, $id, false);
 		$cache_key = 'filenames[%' . $serial_name . '%]:' . (int)$category_id;
 		$filename = $this->Application->getCache($cache_key);
 
 		if ( $filename === false ) {
 			$this->Conn->nextQueryCachable = true;
 			$config = $this->Application->getUnitConfig($prefix);
 
 			$sql = 'SELECT ResourceId
 					FROM ' . $config->getTableName() . '
 					WHERE ' . $config->getIDField() . ' = ' . $this->Conn->qstr($id);
 			$resource_id = $this->Conn->GetOne($sql);
 
 			$this->Conn->nextQueryCachable = true;
 			$sql = 'SELECT Filename
 					FROM ' . TABLE_PREFIX . 'CategoryItems
 					WHERE (ItemResourceId = ' . $resource_id . ') AND (CategoryId = ' . (int)$category_id . ')';
 			$filename = $this->Conn->GetOne($sql);
 
 			if ( $filename !== false ) {
 				$this->Application->setCache($cache_key, $filename);
 			}
 		}
 
 		return $filename;
 	}
 
 	/**
 	 * Sets template and id, corresponding to category item given in url
 	 *
 	 * @param array $url_parts Url parts.
 	 * @param array $params    Params.
 	 *
 	 * @return boolean|string
 	 */
 	protected function parseCategoryItemUrl(array &$url_parts, array &$params)
 	{
 		if ( !$url_parts ) {
 			return false;
 		}
 
 		$item_filename = end($url_parts);
 
 		if ( is_numeric($item_filename) ) {
 			// This page, don't process here.
 			return false;
 		}
 
 		if ( $this->buildPrefix == 'bb' && preg_match('/^bb_([\d]+)/', $item_filename, $regs) ) {
 			// Process topics separately, because they don't use item filenames.
 			array_pop($url_parts);
 			$this->partParsed($item_filename, 'rtl');
 
 			return $this->parseTopicUrl($regs[1], $params);
 		}
 
 		$cat_item = $this->findCategoryItem((int)$params['m_cat_id'], $item_filename);
 
 		if ( $cat_item !== false ) {
 			// Item found.
 			$module_prefix = $cat_item['ItemPrefix'];
 			$item_template = $this->getUrlProcessor()->GetItemTemplate($cat_item, $module_prefix, $params['m_theme']);
 
 			// Converting ResourceId to corresponding Item id.
 			$module_config = $this->Application->getUnitConfig($module_prefix);
 
 			$sql = 'SELECT ' . $module_config->getIDField() . '
 					FROM ' . $module_config->getTableName() . '
 					WHERE ResourceId = ' . $cat_item['ItemResourceId'];
 			$item_id = $this->Conn->GetOne($sql);
 
 			if ( $item_id ) {
 				array_pop($url_parts);
 				$this->partParsed($item_filename, 'rtl');
 
 				if ( $item_template ) {
 					// When template is found in category -> set it.
 					$params['t'] = $item_template;
 				}
 
 				// We have category item id.
 				$params[$module_prefix . '_id'] = $item_id;
 
 				return $module_prefix;
 			}
 		}
 
 		return false;
 	}
 
 	/**
 	 * Set's template and topic id corresponding to topic given in url
 	 *
 	 * @param integer $topic_id Topic ID.
 	 * @param array   $params   Params.
 	 *
 	 * @return string
 	 */
 	protected function parseTopicUrl($topic_id, array &$params)
 	{
 		$sql = 'SELECT c.ParentPath, c.CategoryId
 				FROM ' . TABLE_PREFIX . 'Categories AS c
 				WHERE c.CategoryId = ' . (int)$params['m_cat_id'];
 		$cat_item = $this->Conn->GetRow($sql);
 
 		$item_template = $this->getUrlProcessor()->GetItemTemplate($cat_item, 'bb', $params['m_theme']);
 
 		if ( $item_template ) {
 			$params['t'] = $item_template;
 		}
 
 		$params['bb_id'] = $topic_id;
 
 		return 'bb';
 	}
 
 	/**
 	 * Locating the item in CategoryItems by filename to detect its ItemPrefix and its category ParentPath.
 	 *
 	 * @param integer $category_id Category.
 	 * @param string  $filename    Filename.
 	 *
 	 * @return string
 	 */
 	protected function findCategoryItem($category_id, $filename)
 	{
 		static $cache = array();
 
 		$cache_key = $category_id . ':' . $filename;
 
 		if ( !isset($cache[$cache_key]) ) {
 			$sql = 'SELECT ci.ItemResourceId, ci.ItemPrefix, c.ParentPath, ci.CategoryId
 					FROM ' . TABLE_PREFIX . 'CategoryItems AS ci
 					LEFT JOIN ' . TABLE_PREFIX . 'Categories AS c ON c.CategoryId = ci.CategoryId
 					WHERE (ci.CategoryId = ' . $category_id . ') AND (ci.Filename = ' . $this->Conn->qstr($filename) . ')';
 			$cache[$cache_key] = $this->Conn->GetRow($sql);
 		}
 
 		$category_item = $cache[$cache_key];
 
 		return $category_item && $category_item['ItemPrefix'] == $this->buildPrefix ? $category_item : false;
 	}
 
 }
Index: branches/5.3.x/core/kernel/utility/Router/AbstractReviewRouter.php
===================================================================
--- branches/5.3.x/core/kernel/utility/Router/AbstractReviewRouter.php	(revision 16518)
+++ branches/5.3.x/core/kernel/utility/Router/AbstractReviewRouter.php	(revision 16519)
@@ -1,69 +1,69 @@
 <?php
 
 
 abstract class AbstractReviewRouter extends AbstractRouter
 {
 
 	/**
 	 * Builds url part.
 	 *
 	 * @return boolean Return true to continue to next router; return false not to rewrite given prefix.
 	 */
 	protected function build()
 	{
 		static $default_per_page = array();
 
 		$ret = '';
 		$build_params = $this->extractBuildParams();
 
 		if ( $build_params === false ) {
 			return '';
 		}
 
 		list ($prefix) = explode('.', $this->buildPrefix);
 
 		if ( !array_key_exists($prefix, $default_per_page) ) {
+			/** @var ListHelper $list_helper */
 			$list_helper = $this->Application->recallObject('ListHelper');
-			/* @var $list_helper ListHelper */
 
 			$default_per_page[$prefix] = $list_helper->getDefaultPerPage($prefix);
 		}
 
 		if ( $build_params[$this->buildPrefix . '_id'] ) {
 			return false;
 		}
 		else {
 			if ( $build_params[$this->buildPrefix . '_Page'] == 1 ) {
 				// When printing category items and we are on the 1st page -> there is no information about
 				// category item prefix and $params['pass_category'] will not be added automatically.
 				$this->setBuildParam('pass_category', true);
 			}
 			elseif ( $build_params[$this->buildPrefix . '_Page'] > 1 ) {
 				$this->setBuildParam('page', $build_params[$this->buildPrefix . '_Page']);
 			}
 
 			$per_page = $build_params[$this->buildPrefix . '_PerPage'];
 
 			if ( $per_page && ($per_page != $default_per_page[$this->buildPrefix]) ) {
 				$this->setBuildParam('per_page', $build_params[$this->buildPrefix . '_PerPage']);
 			}
 		}
 
 		return mb_strtolower(rtrim($ret, '/'));
 	}
 
 	/**
 	 * Parses url part.
 	 *
 	 * @param array $url_parts Url parts to parse.
 	 * @param array $params    Parameters, that are used for url building or created during url parsing.
 	 *
 	 * @return boolean Return true to continue to next router; return false to stop processing at this router.
 	 */
 	public function parse(array &$url_parts, array &$params)
 	{
 		// Don't parse anything.
 		return true;
 	}
 
 }
Index: branches/5.3.x/core/kernel/utility/formatters/multilang_formatter.php
===================================================================
--- branches/5.3.x/core/kernel/utility/formatters/multilang_formatter.php	(revision 16518)
+++ branches/5.3.x/core/kernel/utility/formatters/multilang_formatter.php	(revision 16519)
@@ -1,316 +1,315 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class kMultiLanguage extends kFormatter
 {
 
 	/**
 	 * Multilanguage helper
 	 *
 	 * @var kMultiLanguageHelper
 	 */
 	var $helper = null;
 
 	public function __construct()
 	{
 		parent::__construct();
 
 		$this->helper = $this->Application->recallObject('kMultiLanguageHelper');
 	}
 
 	/**
 	 * Returns ML field equivalent to field name specifed
 	 *
 	 * @param string $field_name
 	 * @param bool $from_primary use primary/current language for name custruction
 	 * @return string
 	 */
 	function LangFieldName($field_name, $from_primary = false)
 	{
 		static $primary_language = null;
 
 		if (preg_match('/^l[0-9]+_/', $field_name)) {
 			return $field_name;
 		}
 
 		if (!isset($primary_language)) {
 			$primary_language = $this->Application->GetDefaultLanguageId();
 		}
 
 		$lang = $from_primary ? $primary_language : $this->Application->GetVar('m_lang');
 
 		if (!$lang || ($lang == 'default')) {
 			$lang = $primary_language;
 		}
 
 		return 'l' . $lang . '_' . $field_name;
 	}
 
 	/**
 	 * The method is supposed to alter config options or cofigure object in some way based on its usage of formatters
 	 * The methods is called for every field with formatter defined when configuring item.
 	 * Could be used for adding additional VirtualFields to an object required by some special Formatter
 	 *
 	 * @param string $field_name
 	 * @param array $field_options
 	 * @param kDBBase $object
 	 */
 	function PrepareOptions($field_name, &$field_options, &$object)
 	{
 		if (getArrayValue($field_options, 'master_field') || getArrayValue($field_options, 'options_processed')) {
 			return ;
 		}
 
 		$config = $object->getUnitConfig();
 		$lang_field_name = $this->LangFieldName($field_name);
 
 		//substitute title field
 		$title_field = $config->getTitleField();
 		if ($title_field == $field_name) {
 			$object->getUnitConfig()->setTitleField($lang_field_name);
 		}
 
 		$languages = $this->helper->getLanguages();
 		$primary_language_id = $this->Application->GetDefaultLanguageId();
 		$fields = $config->getFields(Array ());
 		$virtual_fields = $config->getVirtualFields(Array ());
 
 		// substitute real field
 		if (array_key_exists($field_name, $fields)) {
 			$tmp_field_options = $fields[$field_name];
 			$tmp_field_options['master_field'] = $field_name;
 			$tmp_field_options['error_field'] = $field_name;
 			$field_required = array_key_exists('required', $tmp_field_options) && $tmp_field_options['required'];
 
 			foreach ($languages as $language_id) {
 				// make all non-primary language fields not required
 				if ($language_id != $primary_language_id) {
 					unset($tmp_field_options['required']);
 				}
 				elseif ($field_required) {
 					$tmp_field_options['required'] = $field_required;
 				}
 
 				$translated_field = 'l' . $language_id . '_' . $field_name;
 				$fields[$translated_field] = $tmp_field_options;
 				$object->SetFieldOptions($translated_field, $tmp_field_options);
 			}
 
 			// makes original field non-required
 			$object_fields = $object->getFields(); // use kDBBase::getFields, since there are no kDBList::setRequired
 			unset($fields[$field_name]['required'], $object_fields[$field_name]['required']);
 			$object->setFields($object_fields);
 
 			// prevents real field with formatter set to be saved in db
 			$virtual_fields[$field_name] = $object_fields[$field_name];
 			$object->SetFieldOptions($field_name, $object_fields[$field_name], true);
 		}
 		elseif (array_key_exists($field_name, $virtual_fields)) {
 			// substitute virtual field
 			$calculated_fields = $config->getSetting('CalculatedFields', Array ());
 			$calculated_field_special = array_key_exists($object->Special, $calculated_fields) ? $object->Special : (array_key_exists('', $calculated_fields) ? '' : false);
-			/* @var $calculated_fields Array */
+			/** @var Array $calculated_fields */
 
 			$tmp_field_options = $virtual_fields[$field_name];
 			$tmp_field_options['master_field'] = $field_name;
 			$tmp_field_options['error_field'] = $field_name;
 			$field_required = array_key_exists('required', $tmp_field_options) && $tmp_field_options['required'];
 
 			foreach ($languages as $language_id) {
 				// make all non-primary language fields not required
 				if ($language_id != $primary_language_id) {
 					unset($tmp_field_options['required']);
 				}
 				elseif ($field_required) {
 					$tmp_field_options['required'] = $field_required;
 				}
 
 				$translated_field = 'l' . $language_id . '_' . $field_name;
 				$virtual_fields[$translated_field] = $tmp_field_options;
 				$object->SetFieldOptions($translated_field, $tmp_field_options, true);
 
 				// substitute calculated fields associated with given virtual field
 				foreach ($calculated_fields as $special => $special_fields) {
 					if (!array_key_exists($field_name, $special_fields)) {
 						continue;
 					}
 
 					$calculated_fields[$special][$translated_field] = str_replace('%2$s', $language_id, $special_fields[$field_name]);
 
 					if ($special === $calculated_field_special) {
 						$object->addCalculatedField($translated_field, $calculated_fields[$special][$translated_field]);
 					}
 				}
 
 				// manually copy virtual field back to fields (see kDBBase::setVirtualFields about that)
 				$fields[$translated_field] = $tmp_field_options;
 				$object->SetFieldOptions($translated_field, $tmp_field_options);
 			}
 
 			// remove original calculated field
 			foreach ($calculated_fields as $special => $special_fields) {
 				unset($calculated_fields[$special][$field_name]);
 			}
 
 			$object_calculated_fields = $object->getCalculatedFields();
 			unset($object_calculated_fields[$field_name]);
 			$object->setCalculatedFields($object_calculated_fields);
 
 			// save back calculated fields
 			$config->setSetting('CalculatedFields', $calculated_fields);
 
 			// makes original field non-required
 			$object_fields = $object->getFields(); // use kDBBase::getFields, since there are no kDBList::setRequired
 			unset($fields[$field_name]['required'], $object_fields[$field_name]['required']);
 			$object->setFields($object_fields);
 
 			$virtual_field_options = $object->GetFieldOptions($field_name, true);
 			unset($virtual_fields[$field_name]['required'], $virtual_field_options['required']);
 			$object->SetFieldOptions($field_name, $virtual_field_options, true);
 		}
 
 		// substitute grid fields
 		$grids = $config->getGrids(Array ());
-		/* @var $grids Array */
 
 		foreach ($grids as $name => $grid) {
 			if ( getArrayValue($grid, 'Fields', $field_name) ) {
 				// used by column picker to track column position
 				$grids[$name]['Fields'][$field_name]['formatter_renamed'] = true;
 
 				if (!array_key_exists('format', $grids[$name]['Fields'][$field_name])) {
 					// prevent displaying value from primary language
 					// instead of missing value in current language
 					$grids[$name]['Fields'][$field_name]['format'] = 'no_default';
 				}
 
 				if ( !isset($grid['Fields'][$field_name]['title']) ) {
 					$grids[$name]['Fields'][$field_name]['title'] = 'column:la_fld_' . $field_name;
 				}
 
 				kUtil::array_rename_key($grids[$name]['Fields'], $field_name, $lang_field_name);
 			}
 
 			// update sort fields - used for sorting and filtering in SQLs
 			foreach ($grid['Fields'] as $grid_fld_name => $fld_options) {
 				if (isset($fld_options['sort_field']) && $fld_options['sort_field'] == $field_name) {
 					$grids[$name]['Fields'][$grid_fld_name]['sort_field'] = $lang_field_name;
 				}
 			}
 		}
 		$config->setGrids($grids);
 
 		//TODO: substitute possible language-fields sortings after changing language
 		if ( $object->isVirtualField($field_name) ) {
 			$virtual_fields[$field_name]['options_processed'] = true;
 		}
 		else {
 			$fields[$field_name]['options_processed'] = true;
 		}
 
 		$field_options['options_processed'] = true;
 		$config->setFields($fields);
 		$config->setVirtualFields($virtual_fields);
 	}
 
 	/*function UpdateSubFields($field, $value, &$options, &$object)
 	{
 
 	}
 	*/
 
 	/**
 	 * Checks, that field value on primary language is set
 	 *
 	 * @param string $field
 	 * @param mixed $value
 	 * @param Array $options
 	 * @param kDBItem $object
 	 */
 	function UpdateMasterFields($field, $value, &$options, &$object)
 	{
 		$master_field = array_key_exists('master_field', $options) ? $options['master_field'] : false;
 		if (!$master_field) {
 			return ;
 		}
 
 		// moved here from Parse, because at Parse time not all of the fields may be set - this is extremly actual, when working with PopulateMlFields mode
 		$lang = $this->Application->GetVar('m_lang');
 		$def_lang = $this->Application->GetDefaultLanguageId();
 
 		if ( !$this->Application->GetVar('allow_translation') && ($lang != $def_lang) && $object->isRequired($field) ) {
 			$def_lang_field = 'l' . $def_lang . '_' . $master_field;
 
 			if ( !$object->ValidateRequired($def_lang_field, $options) ) {
 				$object->SetError($master_field, 'primary_lang_required');
 
 				if ( $object->isField($def_lang_field) ) {
 					$object->SetError($def_lang_field, 'primary_lang_required');
 				}
 			}
 		}
 	}
 
 	/**
 	 * Formats value of a given field
 	 *
 	 * @param string $value
 	 * @param string $field_name
 	 * @param kDBItem|kDBList $object
 	 * @param string $format
 	 * @return string
 	 */
 	function Format($value, $field_name, &$object, $format=null)
 	{
 		$master_field = $object->GetFieldOption($field_name, 'master_field');
 
 		if (!$master_field) { // if THIS field is master it does NOT have reference to it's master_field
 			$lang = $this->Application->GetVar('m_lang');
 			$value = $object->GetDBField('l'.$lang.'_'.$field_name); //getting value of current language
 			$master_field = $field_name; // THIS is master_field
 		}
 		$options = $object->GetFieldOptions($field_name);
 		$format = isset($format) ? $format : ( isset($options['format']) ? $options['format'] : null);
 
 		// use strpos, becase 2 comma-separated formats could be specified
 		if ($value == '' && strpos($format, 'no_default') === false) { // try to get default language value
 			$def_lang_value = $object->GetDBField('l'.$this->Application->GetDefaultLanguageId().'_'.$master_field);
 			if ($def_lang_value == '') {
 				return NULL;
 			}
 
 			return $this->_replaceFCKLinks($def_lang_value, $options, $format); //return value from default language
 		}
 
 		return $this->_replaceFCKLinks($value, $options, $format);
 	}
 
 	/**
 	 * Performs required field check on primary language
 	 *
 	 * @param mixed $value
 	 * @param string $field_name
 	 * @param kDBItem $object
 	 * @return mixed
 	 * @access public
 	 */
 	public function Parse($value, $field_name, &$object)
 	{
 		if ($value == '') return NULL;
 
 		return $value;
 	}
-}
\ No newline at end of file
+}
Index: branches/5.3.x/core/kernel/utility/formatters/unit_formatter.php
===================================================================
--- branches/5.3.x/core/kernel/utility/formatters/unit_formatter.php	(revision 16518)
+++ branches/5.3.x/core/kernel/utility/formatters/unit_formatter.php	(revision 16519)
@@ -1,131 +1,131 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class kUnitFormatter extends kFormatter {
 
 	/**
 	 * The method is supposed to alter config options or cofigure object in some way based on its usage of formatters
 	 * The methods is called for every field with formatter defined when configuring item.
 	 * Could be used for adding additional VirtualFields to an object required by some special Formatter
 	 *
 	 * @param string $field_name
 	 * @param array $field_options
 	 * @param kDBBase $object
 	 */
 	function PrepareOptions($field_name, &$field_options, &$object)
 	{
 		if( !isset($field_options['master_field']) )
 		{
+			/** @var LanguagesItem $regional */
 			$regional = $this->Application->recallObject('lang.current');
-			/* @var $regional LanguagesItem */
 
 			$add_fields = Array();
 			$options_a =  Array('type' => 'int','error_field' => $field_name,'master_field' => $field_name,'format' => '%d' );
 			$options_b =  Array('type' => 'double','error_field' => $field_name,'master_field' => $field_name,'format' => '%0.2f' );
 
 			switch( $regional->GetDBField('UnitSystem') )
 			{
 				case 2: // US/UK
 					$field_options_copy = $field_options;
 					unset($field_options_copy['min_value_exc']);
 					$add_fields[$field_name.'_a'] = kUtil::array_merge_recursive($field_options_copy, $options_a);
 					$add_fields[$field_name.'_b'] = kUtil::array_merge_recursive($field_options_copy, $options_b);
 				break;
 				default:
 			}
 
 			$add_fields = kUtil::array_merge_recursive($add_fields, $object->getVirtualFields());
 			$object->setVirtualFields($add_fields);
 		}
 	}
 
 	/**
 	 * Used for split fields like timestamp -> date, time
 	 * Called from DBItem Validate (before validation) to get back master field value from its sub_fields
 	 *
 	 * @param string $field
 	 * @param mixed $value
 	 * @param Array $options
 	 * @param kDBItem $object
 	 */
 	function UpdateMasterFields($field, $value, &$options, &$object)
 	{
 		if ( isset($options['master_field']) || ($value == -1) ) {
 			// for infinity setting, otherwise infinity is incorrectly converted back to Kg
 			return ;
 		}
 
+		/** @var LanguagesItem $regional */
 		$regional = $this->Application->recallObject('lang.current');
-		/* @var $regional LanguagesItem */
 
 		if ( $regional->GetDBField('UnitSystem') == 2 ) {
 			// US/UK
 			$major = $this->TypeCast($object->GetDBField($field . '_a'), $options);
 			$minor = $this->TypeCast($object->GetDBField($field . '_b'), $options);
 
 			if ( $major === '' && $minor === '' ) {
 				$value = null;
 			}
 			elseif ( $major === null && $minor === null ) {
 				$fields = $object->getFields();
 				unset($fields[$field]);
 
 				$object->setFields($fields);
 				return;
 			}
 			else {
 				$value = kUtil::Pounds2Kg($major, $minor);
 			}
 		}
 
 		$object->SetDBField($field, $value);
 	}
 
 	/**
 	 * Used for split fields like timestamp -> date, time
 	 * Called from DBItem to update sub fields values after loading item
 	 *
 	 * @param string $field
 	 * @param string $value
 	 * @param Array $options
 	 * @param kDBItem $object
 	 * @return void
 	 * @access public
 	 */
 	public function UpdateSubFields($field, $value, &$options, &$object)
 	{
 		if ( !isset($options['master_field']) ) {
+			/** @var LanguagesItem $regional */
 			$regional = $this->Application->recallObject('lang.current');
-			/* @var $regional LanguagesItem */
 
 			if ( $regional->GetDBField('UnitSystem') == 2 ) {
 				// US/UK
 				if ( $value === null ) {
 					$major = null;
 					$minor = null;
 				}
 				else {
 					list($major, $minor) = kUtil::Kg2Pounds($value);
 //					$major = floor( $value / 0.5 );
 //					$minor = ($value - $major * 0.5) * 32;
 				}
 
 				$object->SetDBField($field . '_a', $major);
 				$object->SetDBField($field . '_b', $minor);
 			}
 		}
 	}
 }
\ No newline at end of file
Index: branches/5.3.x/core/kernel/utility/formatters/formatter.php
===================================================================
--- branches/5.3.x/core/kernel/utility/formatters/formatter.php	(revision 16518)
+++ branches/5.3.x/core/kernel/utility/formatters/formatter.php	(revision 16519)
@@ -1,309 +1,309 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class kFormatter extends kBase {
 
 	/**
 	 * Reference to category helper
 	 *
 	 * @var CategoryHelper
 	 */
 	var $_categoryHelper = null;
 
 	/**
 	 * Creates formatter instance
 	 *
 	 * @access public
 	 */
 	public function __construct()
 	{
 		parent::__construct();
 
 		$this->_categoryHelper = $this->Application->recallObject('CategoryHelper');
 	}
 
 	/**
 	 * Replace FCK links like "@@ID@@" to real page urls, when "using_fck" option is set.
 	 *
 	 * @param string $value
 	 * @param Array $options
 	 * @param string $format
 	 * @return string
 	 */
 	function _replaceFCKLinks(&$value, $options, $format = null)
 	{
 		if ((isset($format) && strpos($format, 'fck_ready') !== false) || (!array_key_exists('using_fck', $options) || !$options['using_fck'])) {
 			// in textarea, where fck will be used OR not using fck
 			return $value;
 		}
 
 		return $this->_categoryHelper->replacePageIds($value);
 	}
 
 	/**
 	 * Convert's value to match type from config
 	 *
 	 * @param mixed $value
 	 * @param Array $options
 	 * @return mixed
 	 * @access protected
 	 */
 	function TypeCast($value, $options)
 	{
 		$ret = true;
 
 		if ( isset($options['type']) ) {
 			$field_type = $options['type'];
 
 			if ($field_type == 'numeric') {
 				trigger_error('Invalid field type <strong>' . $field_type . '</strong> (in TypeCast method), please use <strong>float</strong> instead', E_USER_NOTICE);
 				$field_type = 'float';
 			}
 			elseif ( $field_type == 'string' ) {
 				if ( isset($options['allow_html']) && $options['allow_html'] ) {
 					$value = $this->Application->unescapeRequestVariable($value);
 				}
 
 				return $value;
 			}
 
 			$value = $this->formatNumber($value);
 			$type_ok = preg_match('#int|integer|double|float|real|numeric|string#', $field_type);
 
 			if ( $value != '' && $type_ok ) {
 				$ret = is_numeric($value);
 
 				if ($ret) {
 					$f = 'is_' . $field_type;
 					settype($value, $field_type);
 					$ret = $f($value);
 				}
 			}
 		}
 
 		return $ret ? $value : false;
 	}
 
 	/**
 	 * Formats number, according to regional settings
 	 *
 	 * @param string $number
 	 * @return float
 	 */
 	function formatNumber($number)
 	{
 		static $comma = null, $thousands = null;
 
 		if ( !isset($comma) || !isset($thousands) ) {
+			/** @var LanguagesItem $lang */
 			$lang = $this->Application->recallObject('lang.current');
-			/* @var $lang LanguagesItem */
 
 			$comma = $lang->GetDBField('DecimalPoint');
 			$thousands = $lang->GetDBField('ThousandSep');
 		}
 
 		$number = str_replace($thousands, '', $number);
 		$number = str_replace($comma, '.', $number);
 
 		return $number;
 	}
 
 	/**
 	 * Applies type casting on each array element
 	 * @param Array $src
 	 * @param kDBItem|kDBList|kDBBase $object
 	 * @return Array
 	 * @access public
 	 */
 	public function TypeCastArray($src, &$object)
 	{
 		$dst = array ();
 
 		foreach ($src as $id => $row) {
 			$tmp_row = array ();
 			foreach ($row as $fld => $value) {
 				$field_options = $object->GetFieldOptions($fld);
 				$tmp_row[$fld] = $this->TypeCast($value, $field_options);
 			}
 			$dst[$id] = $tmp_row;
 		}
 
 		return $dst;
 	}
 
 	/**
 	 * Formats value of a given field
 	 *
 	 * @param string $value
 	 * @param string $field_name
 	 * @param kDBItem|kDBList|kDBBase $object
 	 * @param string $format
 	 * @return string
 	 */
 	function Format($value, $field_name, &$object, $format = null)
 	{
 		if ( is_null($value) ) {
 			return '';
 		}
 
 		$options = $object->GetFieldOptions($field_name);
 		if (!isset($format) && array_key_exists('format', $options)) {
 			$format = $options['format'];
 		}
 
 		if ($value === false) {
 			// used ?
 			return $value; // for leaving badly formatted date on the form
 		}
 
 		$original_format = $format;
 		if (isset($format)) {
 			if (strpos($format, 'fck_ready') !== false) {
 				$format = trim(str_replace('fck_ready', '', $format), ';');
 			}
 		}
 
 		if (isset($format) && $format) {
 			if ( substr($format, -1) === 'f' ) {
 				// High precision formats (e.g. '%01.20f') are not supported to keep code below as fast as possible.
 				$value = round($value, substr($format, -2, 1));
 			}
 
 			$value = sprintf($format, $value);
 
 			if ( isset($options['cut_zeros']) && $options['cut_zeros'] ) {
 				// Remove trailing zeros in decimal part (including "." if any left at the end).
 				$value = preg_replace('/\.0+$/', '', $value);
 				$value = preg_replace('/(\.\d+?)0+$/', '$1', $value);
 			}
 		}
 
 		if (preg_match('#int|integer|double|float|real|numeric#', $options['type'])) {
+			/** @var LanguagesItem $lang */
 			$lang = $this->Application->recallObject('lang.current');
-			/* @var $lang LanguagesItem */
 
 			return $lang->formatNumber($value);
 		}
 		elseif ($options['type'] == 'string') {
 			$value = $this->_replaceFCKLinks($value, $options, $original_format);
 		}
 
 		return $value;
 	}
 
 	/**
 	 * Performs basic type validation on form field value
 	 *
 	 * @param mixed $value
 	 * @param string $field_name
 	 * @param kDBItem|kDBList|kDBBase $object
 	 * @return mixed
 	 * @access public
 	 */
 	public function Parse($value, $field_name, &$object)
 	{
 		$options = $object->GetFieldOptions($field_name);
 
 		if ($value == '') {
 			return $options['type'] == 'string' ? $value : null;
 		}
 
 		$tc_value = $this->TypeCast($value, $options);
 
 		if ($tc_value === false) {
 			return $value; // for leaving badly formatted date on the form
 		}
 
 		if(isset($options['type'])) {
 			if (preg_match('#double|float|real|numeric#', $options['type'])) {
 				$tc_value = str_replace(',', '.', $tc_value);
 			}
 		}
 
 		if (isset($options['regexp'])) {
 			if (!preg_match($options['regexp'], $value)) {
 				$object->SetError($field_name, 'invalid_format');
 			}
 		}
 
 		return $tc_value;
 	}
 
 	function HumanFormat($format)
 	{
 		return $format;
 	}
 
 
 	/**
 	 * The method is supposed to alter config options or cofigure object in some way based on its usage of formatters
 	 * The methods is called for every field with formatter defined when configuring item.
 	 * Could be used for adding additional VirtualFields to an object required by some special Formatter
 	 *
 	 * @param string $field_name
 	 * @param array $field_options
 	 * @param kDBBase $object
 	 */
 	function PrepareOptions($field_name, &$field_options, &$object)
 	{
 
 	}
 
 	/**
 	 * Used for split fields like timestamp -> date, time
 	 * Called from DBItem to update sub fields values after loading item
 	 *
 	 * @param string $field
 	 * @param string $value
 	 * @param Array $options
 	 * @param kDBItem|kDBList|kDBBase $object
 	 * @return void
 	 * @access public
 	 */
 	public function UpdateSubFields($field, $value, &$options, &$object)
 	{
 
 	}
 
 	/**
 	 * Used for split fields like timestamp -> date, time
 	 * Called from DBItem Validate (before validation) to get back master field value from its sub_fields
 	 *
 	 * @param string $field
 	 * @param mixed $value
 	 * @param Array $options
 	 * @param kDBItem|kDBList|kDBBase $object
 	 */
 	function UpdateMasterFields($field, $value, &$options, &$object)
 	{
 
 	}
 
 	/**
 	 * Return sample value, that can be entered in this field
 	 *
 	 * @param string $field
 	 * @param Array $options
 	 * @param kDBItem|kDBList|kDBBase $object
 	 * @return string
 	 * @access public
 	 */
 	public function GetSample($field, &$options, &$object)
 	{
 		return isset($options['sample_value']) ? $options['sample_value'] : '';
 	}
 
 }
Index: branches/5.3.x/core/kernel/utility/formatters/upload_formatter.php
===================================================================
--- branches/5.3.x/core/kernel/utility/formatters/upload_formatter.php	(revision 16518)
+++ branches/5.3.x/core/kernel/utility/formatters/upload_formatter.php	(revision 16519)
@@ -1,627 +1,627 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class kUploadFormatter extends kFormatter
 {
 	var $DestinationPath;
 
 	var $FullPath;
 
 	/**
 	 * File helper reference
 	 *
 	 * @var FileHelper
 	 */
 	var $fileHelper = NULL;
 
 	/**
 	 * Uploaded files, that are ordered as required (both live & temp images in one list)
 	 *
 	 * @var Array
 	 * @access protected
 	 */
 	protected $sorting = Array ();
 
 	/**
 	 * Creates formatter instance
 	 *
 	 * @access public
 	 */
 	public function __construct()
 	{
 		parent::__construct();
 
 		$this->fileHelper = $this->Application->recallObject('FileHelper');
 
 		if ( $this->DestinationPath ) {
 			$this->FullPath = FULL_PATH . $this->DestinationPath;
 		}
 	}
 
 	/**
 	 * Processes file uploads from form
 	 *
 	 * @param mixed $value
 	 * @param string $field_name
 	 * @param kDBItem $object
 	 * @return mixed
 	 * @access public
 	 */
 	public function Parse($value, $field_name, &$object)
 	{
 		$value = $this->Application->HttpQuery->unescapeRequestVariable($value);
 		$options = $object->GetFieldOptions($field_name);
 
 		if ( getArrayValue($options, 'upload_dir') ) {
 			$this->DestinationPath = $options['upload_dir'];
 			$this->FullPath = FULL_PATH . $this->DestinationPath;
 		}
 
 		if ( is_array($value) && isset($value['tmp_ids']) ) {
 			// SWF Uploader
 			return $this->_processFlashUploader($value, $field_name, $object);
 		}
 
 		return $this->_processRegularUploader($value, $field_name, $object);
 	}
 
 	/**
 	 * Handles uploaded files, provided by Flash uploader
 	 *
 	 * @param Array|string $value
 	 * @param string $field_name
 	 * @param kDBItem $object
 	 * @return string
 	 * @access protected
 	 */
 	protected function _processFlashUploader($value, $field_name, $object)
 	{
 		$options = $object->GetFieldOptions($field_name);
 		$this->sorting = isset($value['order']) ? explode('|', $value['order']) : Array ();
 
 		if ( $value['tmp_deleted'] ) {
 			$n_upload = Array ();
 			$deleted = explode('|', $value['tmp_deleted']);
 			$upload = explode('|', $value['upload']);
 
 			foreach ($upload as $name) {
 				if ( in_array($name, $deleted) ) {
 					continue;
 				}
 
 				$n_upload[] = $name;
 			}
 
 			$value['upload'] = implode('|', $n_upload);
 		}
 
 		if ( !$value['tmp_ids'] ) {
 			// no pending files -> return already uploaded files
 			return $this->_sortFiles($value['upload']);
 		}
 
 		$swf_uploaded_ids = explode('|', $value['tmp_ids']);
 		$swf_uploaded_names = explode('|', $value['tmp_names']);
 		$existing = $value['upload'] ? explode('|', $value['upload']) : Array ();
 
 		$fret = Array ();
 		$max_files = $this->_getMaxFiles($options);
 		$pending_actions = $object->getPendingActions();
 		$files_to_delete = $this->_getFilesToDelete($object);
 
 		for ($i = 0; $i < min($max_files, count($swf_uploaded_ids)); $i++) {
 			// don't delete uploaded file, when it's name matches delete file name
 			$real_name = $this->_getRealFilename($swf_uploaded_names[$i], $options, $object, $files_to_delete);
 			$file_name = $this->FullPath . $real_name;
 
 			$tmp_file = WRITEABLE . '/tmp/' . $swf_uploaded_ids[$i] . '_' . $swf_uploaded_names[$i];
 			rename($tmp_file, $file_name);
 
 			@chmod($file_name, 0666);
 			$fret[] = getArrayValue($options, 'upload_dir') ? $real_name : $this->DestinationPath . $real_name;
 
 			$pending_actions[] = Array (
 				'action' => 'make_live', 'id' => $object->GetID(), 'field' => $field_name, 'file' => $file_name
 			);
 
 			$this->_renameFileInSorting($swf_uploaded_names[$i], $real_name);
 		}
 
 		$object->setPendingActions($pending_actions);
 
 		return $this->_sortFiles(array_merge($existing, $fret));
 	}
 
 	/**
 	 * Returns files, scheduled for deleting
 	 *
 	 * @param kDBItem $object
 	 * @return Array
 	 * @access protected
 	 */
 	protected function _getFilesToDelete($object)
 	{
 		$ret = Array ();
 
 		foreach ($object->getPendingActions() as $data) {
 			if ( $data['action'] == 'delete' ) {
 				$ret[] = $data['file'];
 			}
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Handles regular file upload
 	 *
 	 * @param string|Array $value
 	 * @param string $field_name
 	 * @param kDBItem $object
 	 * @return string
 	 * @access protected
 	 */
 	protected function _processRegularUploader($value, $field_name, $object)
 	{
 		$ret = !is_array($value) ? $value : '';
 		$options = $object->GetFieldOptions($field_name);
 
 		if ( getArrayValue($value, 'upload') && getArrayValue($value, 'error') == UPLOAD_ERR_NO_FILE ) {
 			// file was not uploaded this time, but was uploaded before, then use previously uploaded file (from db)
 			return getArrayValue($value, 'upload');
 		}
 
 		if ( is_array($value) && count($value) > 1 && $value['size'] ) {
 			if ( is_array($value) && (int)$value['error'] === UPLOAD_ERR_OK ) {
 				$max_file_size = isset($options['max_size']) ? $options['max_size'] : MAX_UPLOAD_SIZE;
 
 				// we can get mime type based on file content and don't use one, provided by the client
 //				$value['type'] = kUtil::mimeContentType($value['tmp_name']);
 
 				if ( getArrayValue($options, 'file_types') && !$this->extensionMatch($value['name'], $options['file_types']) ) {
 					// match by file extensions
 					$error_params = Array (
 						'file_name' => $value['name'],
 						'file_types' => $options['file_types'],
 					);
 
 					$object->SetError($field_name, 'bad_file_format', 'la_error_InvalidFileFormat', $error_params);
 				}
 				elseif ( getArrayValue($options, 'allowed_types') && !in_array($value['type'], $options['allowed_types']) ) {
 					// match by mime type provided by web-browser
 					$error_params = Array (
 						'file_type' => $value['type'],
 						'allowed_types' => $options['allowed_types'],
 					);
 
 					$object->SetError($field_name, 'bad_file_format', 'la_error_InvalidFileFormat', $error_params);
 				}
 				elseif ( $value['size'] > $max_file_size ) {
 					$object->SetError($field_name, 'bad_file_size', 'la_error_FileTooLarge');
 				}
 				elseif ( !is_writable($this->FullPath) ) {
 					$object->SetError($field_name, 'cant_save_file', 'la_error_cant_save_file');
 				}
 				else {
 					$real_name = $this->_getRealFilename($value['name'], $options, $object);
 					$file_name = $this->FullPath . $real_name;
 
 					$storage_format = isset($options['storage_format']) ? $options['storage_format'] : false;
 
 					if ( $storage_format ) {
+						/** @var ImageHelper $image_helper */
 						$image_helper = $this->Application->recallObject('ImageHelper');
-						/* @var $image_helper ImageHelper */
 
 						move_uploaded_file($value['tmp_name'], $value['tmp_name'] . '.jpg'); // add extension, so ResizeImage can work
 						$url = $image_helper->ResizeImage($value['tmp_name'] . '.jpg', $storage_format);
 						$tmp_name = preg_replace('/^' . preg_quote($this->Application->BaseURL(), '/') . '/', '/', $url);
 						$moved = rename($tmp_name, $file_name);
 					}
 					else {
 						$moved = move_uploaded_file($value['tmp_name'], $file_name);
 					}
 
 					if ( !$moved ) {
 						$object->SetError($field_name, 'cant_save_file', 'la_error_cant_save_file');
 					}
 					else {
 						@chmod($file_name, 0666);
 
 						if ( getArrayValue($options, 'size_field') ) {
 							$object->SetDBField($options['size_field'], $value['size']);
 						}
 
 						if ( getArrayValue($options, 'orig_name_field') ) {
 							$object->SetDBField($options['orig_name_field'], $value['name']);
 						}
 
 						if ( getArrayValue($options, 'content_type_field') ) {
 							$object->SetDBField($options['content_type_field'], $value['type']);
 						}
 
 						$ret = getArrayValue($options, 'upload_dir') ? $real_name : $this->DestinationPath . $real_name;
 
 						// delete previous file, when new file is uploaded under same field
 						/*$previous_file = isset($value['upload']) ? $value['upload'] : false;
 						if ( $previous_file && file_exists($this->FullPath . $previous_file) ) {
 							unlink($this->FullPath . $previous_file);
 						}*/
 					}
 				}
 			}
 			else {
 				$object->SetError($field_name, 'cant_save_file', 'la_error_cant_save_file');
 			}
 		}
 
 		if ( (count($value) > 1) && $value['error'] && ($value['error'] != UPLOAD_ERR_NO_FILE) ) {
 			$object->SetError($field_name, 'cant_save_file', 'la_error_cant_save_file', $value);
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Checks, that given file name has on of provided file extensions
 	 *
 	 * @param string $filename
 	 * @param string $file_types
 	 * @return bool
 	 * @access protected
 	 */
 	protected function extensionMatch($filename, $file_types)
 	{
 		if ( preg_match_all('/\*\.(.*?)(;|$)/', $file_types, $regs) ) {
 			$file_extension = mb_strtolower(pathinfo($filename, PATHINFO_EXTENSION));
 			$file_extensions = array_map('mb_strtolower', $regs[1]);
 
 			return in_array($file_extension, $file_extensions);
 		}
 
 		return true;
 	}
 
 	/**
 	 * Resorts uploaded files according to given file order
 	 *
 	 * @param Array|string $files
 	 * @return string
 	 * @access protected
 	 */
 	protected function _sortFiles($files)
 	{
 		if ( !is_array($files) ) {
 			$files = explode('|', $files);
 		}
 
 		$sorted_files = array_intersect($this->sorting, $files); // removes deleted files from sorting
 		$new_files = array_diff($files, $sorted_files); // files, that weren't sorted - add to the end
 
 		return implode('|', array_merge($sorted_files, $new_files));
 	}
 
 	/**
 	 * Returns maximal allowed file count per field
 	 *
 	 * @param Array $options
 	 * @return int
 	 * @access protected
 	 */
 	protected function _getMaxFiles($options)
 	{
 		if ( !isset($options['multiple']) ) {
 			return 1;
 		}
 
 		return $options['multiple'] == false ? 1 : $options['multiple'];
 	}
 
 	/**
 	 * Returns final filename after applying storage-engine specific naming
 	 *
 	 * @param string $file_name
 	 * @param Array $options
 	 * @param kDBItem $object
 	 * @param Array $files_to_delete
 	 * @return string
 	 * @access protected
 	 */
 	protected function _getRealFilename($file_name, $options, $object, $files_to_delete = Array ())
 	{
 		$real_name = $this->getStorageEngineFile($file_name, $options, $object->Prefix);
 		$real_name = $this->getStorageEngineFolder($real_name, $options) . $real_name;
 
 		return $this->fileHelper->ensureUniqueFilename($this->FullPath, $real_name, $files_to_delete);
 	}
 
 	/**
 	 * Renames file in sorting list
 	 *
 	 * @param string $old_name
 	 * @param string $new_name
 	 * @return void
 	 * @access protected
 	 */
 	protected function _renameFileInSorting($old_name, $new_name)
 	{
 		$index = array_search($old_name, $this->sorting);
 
 		if ( $index !== false ) {
 			$this->sorting[$index] = $new_name;
 		}
 	}
 
 	function getSingleFormat($format)
 	{
 		$single_mapping = Array (
 			'file_raw_urls' => 'raw_url',
 			'file_display_names' => 'display_name',
 			'file_urls' => 'full_url',
 			'file_paths' => 'full_path',
 			'file_sizes' => 'file_size',
 			'files_resized' => 'resize',
 			'img_sizes' => 'img_size',
 			'wms' => 'wm',
 		);
 
 		return $single_mapping[$format];
 	}
 
 	/**
 	 * Return formatted file url,path or size (or same for multiple files)
 	 *
 	 * @param string $value
 	 * @param string $field_name
 	 * @param kDBItem|kDBList $object
 	 * @param string $format
 	 * @return string
 	 */
 	function Format($value, $field_name, &$object, $format = NULL)
 	{
 		if ( is_null($value) ) {
 			return '';
 		}
 
 		$options = $object->GetFieldOptions($field_name);
 
 		if ( !isset($format) ) {
 			$format = isset($options['format']) ? $options['format'] : false;
 		}
 
 		if ( $format && preg_match('/(file_raw_urls|file_display_names|file_urls|file_paths|file_names|file_sizes|img_sizes|files_resized|wms)(.*)/', $format, $regs) ) {
 			if ( !$value || $format == 'file_names' ) {
 				// storage format matches display format OR no value
 				return $value;
 			}
 
 			$ret = Array ();
 			$files = explode('|', $value);
 			$format = $this->getSingleFormat($regs[1]) . $regs[2];
 
 			foreach ($files as $a_file) {
 				$ret[] = $this->GetFormatted($a_file, $field_name, $object, $format);
 			}
 
 			return implode('|', $ret);
 		}
 
 		$tc_value = $this->TypeCast($value, $options);
 
 		if ( ($tc_value === false) || ($tc_value != $value) ) {
 			// for leaving badly formatted date on the form
 			return $value;
 		}
 
 		return $this->GetFormatted($tc_value, $field_name, $object, $format);
 	}
 
 	/**
 	 * Return formatted file url,path or size
 	 *
 	 * @param string $value
 	 * @param string $field_name
 	 * @param kDBItem $object
 	 * @param string $format
 	 * @return string
 	 */
 	function GetFormatted($value, $field_name, &$object, $format = NULL)
 	{
 		if ( !$format ) {
 			return $value;
 		}
 
 		$options = $object->GetFieldOptions($field_name);
 		$upload_dir = isset($options['include_path']) && $options['include_path'] ? '' : $this->getUploadDir($options);
 		$file_path = strlen($value) ? FULL_PATH . str_replace('/', DIRECTORY_SEPARATOR, $upload_dir) . $value : '';
 
 		if ( preg_match('/resize:([\d]*)x([\d]*)/', $format, $regs) ) {
+			/** @var ImageHelper $image_helper */
 			$image_helper = $this->Application->recallObject('ImageHelper');
-			/* @var $image_helper ImageHelper */
 
 			try {
 				return $image_helper->ResizeImage($file_path, $format);
 			}
 			catch ( RuntimeException $e ) {
 				// error, during image resize -> return empty string
 				return '';
 			}
 		}
 		elseif ( !strlen($file_path) || !file_exists($file_path) ) {
 			// file doesn't exist OR not uploaded
 			return '';
 		}
 
 		switch ($format) {
 			case 'display_name':
 				return kUtil::removeTempExtension($value);
 				break;
 
 			case 'raw_url':
 				return $this->fileHelper->pathToUrl($file_path);
 				break;
 
 			case 'full_url':
 				$direct_links = isset($options['direct_links']) ? $options['direct_links'] : true;
 
 				if ( $direct_links ) {
 					return $this->fileHelper->pathToUrl($file_path);
 				}
 				else {
 					$url_params = Array (
 						'pass' => 'm,'.$object->Prefix,
 						$object->Prefix . '_event' => 'OnViewFile',
 						'file' => $value, 'field' => $field_name
 					);
 
 					return $this->Application->HREF('', '', $url_params);
 				}
 				break;
 
 			case 'full_path':
 				return $file_path;
 				break;
 
 			case 'file_size':
 				return filesize($file_path);
 				break;
 
 			case 'img_size':
+				/** @var ImageHelper $image_helper */
 				$image_helper = $this->Application->recallObject('ImageHelper');
-				/* @var $image_helper ImageHelper */
 
 				$image_info = $image_helper->getImageInfo($file_path);
 				return $image_info ? $image_info[3] : '';
 				break;
 		}
 
 		return sprintf($format, $value);
 	}
 
 	/**
 	 * Creates & returns folder, based on storage engine specified in field options
 	 *
 	 * @param string $file_name
 	 * @param array $options
 	 * @return string
 	 * @access protected
 	 * @throws Exception
 	 */
 	protected function getStorageEngineFolder($file_name, $options)
 	{
 		$storage_engine = (string)getArrayValue($options, 'storage_engine');
 
 		if ( !$storage_engine ) {
 			return '';
 		}
 
 		switch ($storage_engine) {
 			case StorageEngine::HASH:
 				$folder_path = kUtil::getHashPathForLevel($file_name);
 				break;
 
 			case StorageEngine::TIMESTAMP:
 				$folder_path = date('Y-m/d/');
 				break;
 
 			default:
 				throw new Exception('Unknown storage engine "<strong>' . $storage_engine . '</strong>".');
 				break;
 		}
 
 		return $folder_path;
 	}
 
 	/**
 	 * Applies prefix & suffix to uploaded filename, based on storage engine in field options
 	 *
 	 * @param string $name
 	 * @param array $options
 	 * @param string $unit_prefix
 	 * @return string
 	 * @access protected
 	 */
 	protected function getStorageEngineFile($name, $options, $unit_prefix)
 	{
 		$prefix = $this->getStorageEngineFilePart(getArrayValue($options, 'filename_prefix'), $unit_prefix);
 		$suffix = $this->getStorageEngineFilePart(getArrayValue($options, 'filename_suffix'), $unit_prefix);
 
 		$parts = pathinfo($name);
 
 		return ($prefix ? $prefix . '_' : '') . $parts['filename'] . ($suffix ? '_' . $suffix : '') . '.' . $parts['extension'];
 	}
 
 	/**
 	 * Creates prefix/suffix to join with uploaded file
 	 *
 	 * Added "u" before user_id to keep this value after FileHelper::ensureUniqueFilename method call
 	 *
 	 * @param string $option
 	 * @param string $unit_prefix
 	 * @return string
 	 * @access protected
 	 */
 	protected function getStorageEngineFilePart($option, $unit_prefix)
 	{
 		$replace_from = Array (
 			StorageEngine::PS_DATE_TIME, StorageEngine::PS_PREFIX, StorageEngine::PS_USER
 		);
 
 		$replace_to = Array (
 			date('Ymd-His'), $unit_prefix, 'u' . $this->Application->RecallVar('user_id')
 		);
 
 		return str_replace($replace_from, $replace_to, $option);
 	}
 
 	public function getUploadDir($options)
 	{
 		return isset($options['upload_dir']) ? $options['upload_dir'] : $this->DestinationPath;
 	}
 }
 
 
 class kPictureFormatter extends kUploadFormatter
 {
 	public function __construct()
 	{
 		$this->NakeLookupPath = IMAGES_PATH; // used ?
 		$this->DestinationPath = kUtil::constOn('ADMIN') ? IMAGES_PENDING_PATH : IMAGES_PATH;
 
 		parent::__construct();
 	}
 
 	/**
 	 * Return formatted file url,path or size
 	 *
 	 * @param string $value
 	 * @param string $field_name
 	 * @param kDBItem $object
 	 * @param string $format
 	 * @return string
 	 */
 	function GetFormatted($value, $field_name, &$object, $format = NULL)
 	{
 		if ( $format == 'img_size' ) {
 			$options = $object->GetFieldOptions($field_name);
 			$img_path = FULL_PATH . '/' . $this->getUploadDir($options) . $value;
 			$image_info = getimagesize($img_path);
 
 			return ' ' . $image_info[3];
 		}
 
 		return parent::GetFormatted($value, $field_name, $object, $format);
 	}
 }
Index: branches/5.3.x/core/kernel/utility/temp_handler.php
===================================================================
--- branches/5.3.x/core/kernel/utility/temp_handler.php	(revision 16518)
+++ branches/5.3.x/core/kernel/utility/temp_handler.php	(revision 16519)
@@ -1,1666 +1,1666 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 /**
  * Create a public interface to temp table structure of one unit and it's sub-items
  *
  * Pattern: Facade
  */
 class kTempTablesHandler extends kBase {
 
 	/**
 	 * Tables
 	 *
 	 * @var kTempHandlerTopTable
 	 */
 	protected $_tables;
 
 	/**
 	 * Event, that was used to create this object
 	 *
 	 * @var kEvent
 	 * @access protected
 	 */
 	protected $parentEvent = null;
 
 	/**
 	 * Sets new parent event to the object
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access public
 	 */
 	public function setParentEvent($event)
 	{
 		$this->parentEvent = $event;
 
 		if ( is_object($this->_tables) ) {
 			$this->_tables->setParentEvent($event);
 		}
 	}
 
 	/**
 	 * Scans table structure of given unit
 	 *
 	 * @param string $prefix
 	 * @param Array $ids
 	 * @return void
 	 * @access public
 	 */
 	public function BuildTables($prefix, $ids)
 	{
 		$this->_tables = new kTempHandlerTopTable($prefix, $ids);
 
 		if ( is_object($this->parentEvent) ) {
 			$this->_tables->setParentEvent($this->parentEvent);
 		}
 	}
 
 	/**
 	 * Returns reference to top table.
 	 *
 	 * @return kTempHandlerTopTable
 	 */
 	public function getTopTable()
 	{
 		return $this->_tables;
 	}
 
 	/**
 	 * Create temp table for editing db record from live table. If none ids are given, then just empty tables are created.
 	 *
 	 * @return void
 	 * @access public
 	 */
 	public function PrepareEdit()
 	{
 		$this->_tables->doCopyLiveToTemp();
 		$this->_tables->checkSimultaneousEdit();
 	}
 
 	/**
 	 * Deletes temp tables without copying their data back to live tables
 	 *
 	 * @return void
 	 * @access public
 	 */
 	public function CancelEdit()
 	{
 		$this->_tables->deleteAll();
 	}
 
 	/**
 	 * Saves changes made in temp tables to live tables
 	 *
 	 * @param Array $master_ids
 	 * @return bool
 	 * @access public
 	 */
 	public function SaveEdit($master_ids = Array())
 	{
 		// SessionKey field is required for deleting records from expired sessions
 		$sleep_count = 0;
 		$conn = $this->_getSeparateConnection();
 		$master_ids = $this->_tables->parseTempIds($master_ids);
 
 		do {
 			// acquire lock
 			$conn->ChangeQuery('LOCK TABLES ' . TABLE_PREFIX . 'Semaphores WRITE');
 
 			$another_coping_active = false;
 			$sql = 'SELECT MainIDs
 					FROM ' . TABLE_PREFIX . 'Semaphores
 					WHERE MainPrefix = ' . $conn->qstr($this->_tables->getPrefix()) . ' AND MainIDs <> "0"';
 			$other_semaphores_main_ids = $conn->GetCol($sql);
 
 			foreach ( $other_semaphores_main_ids as $other_semaphore_main_ids ) {
 				$other_semaphore_main_ids = explode(',', $other_semaphore_main_ids);
 
 				if ( array_intersect($master_ids, $other_semaphore_main_ids) ) {
 					$another_coping_active = true;
 					break;
 				}
 			}
 
 			if ( $another_coping_active ) {
 				// another user is coping data from temp table to live -> release lock and try again after 1 second
 				$conn->ChangeQuery('UNLOCK TABLES');
 				$sleep_count++;
 				sleep(1);
 			}
 		} while ($another_coping_active && ($sleep_count <= 30));
 
 		if ( $sleep_count > 30 ) {
 			// another coping process failed to finished in 30 seconds
 			$error_message = $this->Application->Phrase('la_error_TemporaryTableCopyingFailed');
 			$this->Application->SetVar('_temp_table_message', $error_message);
 
 			return false;
 		}
 
 		// mark, that we are coping from temp to live right now, so other similar attempt (from another script) will fail
 		$fields_hash = Array (
 			'SessionKey' => $this->Application->GetSID(),
 			'Timestamp' => time(),
 			'MainPrefix' => $this->_tables->getPrefix(),
 			'MainIDs' => implode(',', $master_ids),
 		);
 
 		$conn->doInsert($fields_hash, TABLE_PREFIX . 'Semaphores');
 		$semaphore_id = $conn->getInsertID();
 
 		// unlock table now to prevent permanent lock in case, when coping will end with SQL error in the middle
 		$conn->ChangeQuery('UNLOCK TABLES');
 
 		$ids = $this->_tables->doCopyTempToLive($master_ids);
 
 		// remove mark, that we are coping from temp to live
 		$conn->Query('LOCK TABLES ' . TABLE_PREFIX . 'Semaphores WRITE');
 
 		$sql = 'DELETE FROM ' . TABLE_PREFIX . 'Semaphores
 				WHERE SemaphoreId = ' . $semaphore_id;
 		$conn->ChangeQuery($sql);
 
 		$conn->ChangeQuery('UNLOCK TABLES');
 
 		return $ids;
 	}
 
 	/**
 	 * Deletes unit data for given items along with related sub-items
 	 *
 	 * @param string $prefix
 	 * @param string $special
 	 * @param Array $ids
 	 * @throws InvalidArgumentException
 	 */
 	function DeleteItems($prefix, $special, $ids)
 	{
 		if ( strpos($prefix, '.') !== false ) {
 			throw new InvalidArgumentException("Pass prefix and special as separate arguments");
 		}
 
 		if ( !is_array($ids) ) {
 			throw new InvalidArgumentException('Incorrect ids format');
 		}
 
 		$this->_tables->doDeleteItems(rtrim($prefix . '.' . $special, '.'), $ids);
 	}
 
 	/**
 	 * Clones given ids
 	 *
 	 * @param string $prefix
 	 * @param string $special
 	 * @param Array $ids
 	 * @param Array $master
 	 * @param int $foreign_key
 	 * @param string $parent_prefix
 	 * @param bool $skip_filenames
 	 * @return Array
 	 */
 	function CloneItems($prefix, $special, $ids, $master = null, $foreign_key = null, $parent_prefix = null, $skip_filenames = false)
 	{
 		return $this->_tables->doCloneItems($prefix . '.' . $special, $ids, $foreign_key, $skip_filenames);
 	}
 
 	/**
 	 * Create separate connection for locking purposes
 	 *
 	 * @return kDBConnection
 	 * @access protected
 	 */
 	protected function _getSeparateConnection()
 	{
 		static $connection = null;
 
 		if (!isset($connection)) {
+			/** @var kDBConnection $connection */
 			$connection = $this->Application->makeClass( 'kDBConnection', Array (SQL_TYPE, Array ($this->Application, 'handleSQLError')) );
-			/* @var $connection kDBConnection */
 
 			$connection->debugMode = $this->Application->isDebugMode();
 			$connection->Connect(SQL_SERVER, SQL_USER, SQL_PASS, SQL_DB);
 		}
 
 		return $connection;
 	}
 }
 
 /**
  * Base class, that represents one table
  *
  * Pattern: Composite
  */
 abstract class kTempHandlerTable extends kBase {
 
 	/**
 	 * Temp table was created from live table OR it was copied back to live table
 	 */
 	const STATE_COPIED = 1;
 
 	/**
 	 * Temp table was deleted
 	 */
 	const STATE_DELETED = 2;
 
 	/**
 	 * Reference to parent table
 	 *
 	 * @var kTempHandlerTable
 	 * @access protected
 	 */
 	protected $_parent;
 
 	/**
 	 * Field in this db table, that holds ID from it's parent table
 	 *
 	 * @var string
 	 * @access protected
 	 */
 	protected $_foreignKey = '';
 
 	/**
 	 * This table is connected to multiple parent tables
 	 *
 	 * @var bool
 	 * @access protected
 	 */
 	protected $_multipleParents = false;
 
 	/**
 	 * Foreign key cache
 	 *
 	 * @var Array
 	 * @access protected
 	 */
 	protected $_foreignKeyCache = Array ();
 
 	/**
 	 * Field in parent db table from where foreign key field value originates
 	 *
 	 * @var string
 	 * @access protected
 	 */
 	protected $_parentTableKey = '';
 
 	/**
 	 * Additional WHERE filter, that determines what records needs to be processed
 	 *
 	 * @var string
 	 * @access protected
 	 */
 	protected $_constrain = '';
 
 	/**
 	 * Automatically clone records from this table when parent table record is cloned
 	 *
 	 * @var bool
 	 * @access protected
 	 */
 	protected $_autoClone = true;
 
 	/**
 	 * Automatically delete records from this table when parent table record is deleted
 	 *
 	 * @var bool
 	 * @access protected
 	 */
 	protected $_autoDelete = true;
 
 	/**
 	 * List of sub-tables
 	 *
 	 * @var kTempHandlerSubTable[]
 	 * @access protected
 	 */
 	protected $_subTables = Array ();
 
 	/**
 	 * Window ID of current window
 	 *
 	 * @var int
 	 * @access protected
 	 */
 	protected $_windowID = '';
 
 	/**
 	 * Unit prefix
 	 *
 	 * @var string
 	 * @access protected
 	 */
 	protected $_prefix = '';
 
 	/**
 	 * IDs, that needs to be processed
 	 *
 	 * @var Array
 	 * @access protected
 	 */
 	protected $_ids = Array ();
 
 	/**
 	 * Table name-based 2-level array of cloned ids
 	 *
 	 * @static
 	 * @var array
 	 * @access protected
 	 */
 	static protected $_clonedIds = Array ();
 
 	/**
 	 * IDs of newly cloned items (key - special, value - array of ids)
 	 *
 	 * @var Array
 	 * @access protected
 	 */
 	protected $_savedIds = Array ();
 
 	/**
 	 * ID field of associated db table
 	 *
 	 * @var string
 	 * @access protected
 	 */
 	protected $_idField = '';
 
 	/**
 	 * Name of associated db table
 	 *
 	 * @var string
 	 * @access protected
 	 */
 	protected $_tableName = '';
 
 	/**
 	 * State of the table
 	 *
 	 * @var int
 	 * @access protected
 	 */
 	protected $_state = 0;
 
 	/**
 	 * Tells that this is last usage of this table
 	 *
 	 * @var bool
 	 * @access protected
 	 */
 	protected $_lastUsage = false;
 
 	/**
 	 * Event, that was used to create this object
 	 *
 	 * @var kEvent
 	 * @access protected
 	 */
 	protected $_parentEvent = null;
 
 	/**
 	 * Creates table object
 	 *
 	 * @param string $prefix
 	 * @param Array $ids
 	 */
 	public function __construct($prefix, $ids = Array ())
 	{
 		parent::__construct();
 
 		$this->_windowID = $this->Application->GetVar('m_wid');
 
 		$this->_prefix = $prefix;
 		$this->_ids = $ids;
 
 		if ( !$this->unitRegistered() ) {
 			return;
 		}
 
 		$this->_collectTableInfo();
 	}
 
 	/**
 	 * Creates temp tables (recursively) and optionally fills them with data from live table
 	 *
 	 * @param Array $foreign_keys
 	 * @return void
 	 * @access public
 	 */
 	public function doCopyLiveToTemp($foreign_keys = Array ())
 	{
 		$parsed_prefix = $this->Application->processPrefix($this->_prefix);
 		$foreign_key_field = $this->_foreignKey ? $this->_foreignKey : $this->_idField;
 
 		if ( !is_numeric($parsed_prefix['special']) ) {
 			// TODO: find out what numeric specials are used for
 			if ( $this->_delete() ) {
 				$this->_create();
 			}
 		}
 
 		$foreign_keys = $this->_parseLiveIds($foreign_keys);
 
 		if ( $foreign_keys != '' && !$this->_inState(self::STATE_COPIED) ) {
 			// 1. copy data from live table into temp table
 			$sql = 'INSERT INTO ' . $this->_getTempTableName() . '
 					SELECT *
 					FROM ' . $this->_tableName . '
 					WHERE ' . $foreign_key_field . ' IN (' . $foreign_keys . ')';
 			$this->Conn->Query($this->_addConstrain($sql));
 
 			$this->_setAsCopied();
 
 			// 2. get ids, that were actually copied into temp table
 			$sql = 'SELECT ' . $this->_idField . '
 					FROM ' . $this->_tableName . '
 					WHERE ' . $foreign_key_field . ' IN (' . $foreign_keys . ')';
 			$copied_ids = $this->Conn->GetCol($this->_addConstrain($sql));
 
 			$this->_raiseEvent('OnAfterCopyToTemp', '', $copied_ids);
 		}
 
 		foreach ($this->_subTables as $sub_table) {
 			if ( !$sub_table->_parentTableKey ) {
 				continue;
 			}
 
 			if ( $foreign_keys != '' && $sub_table->_parentTableKey != $foreign_key_field ) {
 				// if sub-table isn't connected this this table by id field, then get foreign keys
 				$sql = 'SELECT ' . $sub_table->_parentTableKey . '
 						FROM ' . $this->_tableName . '
 						WHERE ' . $foreign_key_field . ' IN (' . $foreign_keys . ')';
 				$sub_foreign_keys = implode(',', $this->Conn->GetCol($sql));
 			}
 			else {
 				$sub_foreign_keys = $foreign_keys;
 			}
 
 			$sub_table->doCopyLiveToTemp($sub_foreign_keys);
 		}
 	}
 
 	/**
 	 * Ensures, that ids are always a comma-separated string, that is ready to be used in SQLs
 	 *
 	 * @param Array|string $ids
 	 * @return string
 	 * @access protected
 	 */
 	protected function _parseLiveIds($ids)
 	{
 		if ( !$ids ) {
 			$ids = $this->_ids;
 		}
 
 		if ( is_array($ids) ) {
 			$ids = implode(',', $ids);
 		}
 
 		return $ids;
 	}
 
 	/**
 	 * Copies data from temp to live table and returns IDs of copied records
 	 *
 	 * @param Array $current_ids
 	 * @return Array
 	 * @access public
 	 */
 	public function doCopyTempToLive($current_ids = Array())
 	{
 		$current_ids = $this->_parseTempIds($current_ids);
 
 		if ( $current_ids ) {
 			$this->_deleteFromLive($current_ids);
 
 			if ( $this->_subTables ) {
 				if ( $this->_inState(self::STATE_COPIED) || !$this->_lastUsage ) {
 					return Array ();
 				}
 
 				$this->_copyTempToLiveWithSubTables($current_ids);
 			}
 			elseif ( !$this->_inState(self::STATE_COPIED) && $this->_lastUsage ) {
 				// If current master doesn't have sub-tables - we could use mass operations
 				// We don't need to delete items from live here, as it get deleted in the beginning of the
 				// method for MasterTable or in parent table processing for sub-tables
 
 				$this->_copyTempToLiveWithoutSubTables($current_ids);
 
 				// no need to clear temp table - it will be dropped by next statement
 			}
 		}
 
 		if ( !$this->_lastUsage ) {
 			return Array ();
 		}
 
 		/*if ( is_array(getArrayValue($master, 'ForeignKey')) )	{ //if multiple ForeignKeys
 			if ( $master['ForeignKey'][$parent_prefix] != end($master['ForeignKey']) ) {
 				return; // Do not delete temp table if not all ForeignKeys have been processed (current is not the last)
 			}
 		}*/
 
 		$this->_delete();
 		$this->Application->resetCounters($this->_tableName);
 
 		return $this->getSavedIds();
 	}
 
 	/**
 	 * Deletes unit db records along with related sub-items by id field
 	 *
 	 * @param string $prefix_special
 	 * @param Array $ids
 	 * @return void
 	 * @access public
 	 */
 	public function doDeleteItems($prefix_special, $ids)
 	{
 		if ( !$ids ) {
 			return;
 		}
 
 		$object = $this->_getItem($prefix_special);
 		$parsed_prefix = $this->Application->processPrefix($prefix_special);
 
 		foreach ($ids as $id) {
 			$object->Load($id);
 			$original_values = $object->GetFieldValues();
 
 			if ( !$object->Delete($id) ) {
 				continue;
 			}
 
 			foreach ($this->_subTables as $sub_table) {
 				$sub_table->subDeleteItems($object, $parsed_prefix['special'], $original_values);
 			}
 		}
 	}
 
 	/**
 	 * Clones item by id and it's sub-items by foreign key
 	 *
 	 * @param string $prefix_special
 	 * @param Array $ids
 	 * @param string $foreign_key
 	 * @param bool $skip_filenames
 	 * @return Array
 	 * @access public
 	 */
 	public function doCloneItems($prefix_special, $ids, $foreign_key = null, $skip_filenames = false)
 	{
 		$object = $this->_getItem($prefix_special);
 		$object->PopulateMultiLangFields();
 
 		foreach ($ids as $id) {
 			$mode = 'create';
 			$cloned_ids = getArrayValue(self::$_clonedIds, $this->_tableName);
 
 			if ( $cloned_ids ) {
 				// if we have already cloned the id, replace it with cloned id and set mode to update
 				// update mode is needed to update second ForeignKey for items cloned by first ForeignKey
 				if ( getArrayValue($cloned_ids, $id) ) {
 					$id = $cloned_ids[$id];
 					$mode = 'update';
 				}
 			}
 
 			$object->Load($id);
 			$original_values = $object->GetFieldValues();
 
 			if ( !$skip_filenames ) {
 				$master = Array ('ForeignKey' => $this->_foreignKey, 'TableName' => $this->_tableName);
 				$object->NameCopy($master, $foreign_key);
 			}
 			elseif ( $object instanceof kCatDBItem ) {
 				$object->useFilenames = false;
 			}
 
 			if ( isset($foreign_key) ) {
 				$object->SetDBField($this->_foreignKey, $foreign_key);
 			}
 
 			if ( $mode == 'create' ) {
 				$this->_raiseEvent('OnBeforeClone', $object->Special, Array ($object->GetID()), $foreign_key);
 			}
 
 			$object->inCloning = true;
 			$res = $mode == 'update' ? $object->Update() : $object->Create();
 			$object->inCloning = false;
 
 			if ( $res ) {
 				if ( $mode == 'create' && $this->_multipleParents ) {
 					// remember original => clone mapping for dual ForeignKey updating
 					self::$_clonedIds[$this->_tableName][$id] = $object->GetID();
 				}
 
 				if ( $mode == 'create' ) {
 					$this->_raiseEvent('OnAfterClone', $object->Special, Array ($object->GetID()), $foreign_key, Array ('original_id' => $id));
 					$this->_saveId($object->Special, $object->GetID());
 				}
 
 				foreach ($this->_subTables as $sub_table) {
 					$sub_table->subCloneItems($object, $original_values);
 				}
 			}
 		}
 
 		return $this->getSavedIds($object->Special);
 	}
 
 	/**
 	 * Returns item, associated with this table
 	 *
 	 * @param string $prefix_special
 	 * @return kDBItem
 	 * @access protected
 	 */
 	protected function _getItem($prefix_special)
 	{
 		// recalling by different name, because we may get kDBList, if we recall just by prefix
 		$parsed_prefix = $this->Application->processPrefix($prefix_special);
 		$recall_prefix = $parsed_prefix['prefix'] . '.' . preg_replace('/-item$/', '', $parsed_prefix['special']) . '-item';
 
+		/** @var kDBItem $object */
 		$object = $this->Application->recallObject($recall_prefix, null, Array ('skip_autoload' => true, 'parent_event' => $this->_parentEvent));
-		/* @var $object kDBItem */
 
 		return $object;
 	}
 
 	/**
 	 * Copies data from temp table that has sub-tables one-by-one record
 	 *
 	 * @param $temp_ids
 	 * @return void
 	 * @access protected
 	 */
 	protected function _copyTempToLiveWithSubTables($temp_ids)
 	{
 		$live_ids = Array ();
 
 		foreach ($temp_ids as $index => $temp_id) {
 			$this->_raiseEvent('OnBeforeCopyToLive', '', Array ($temp_id));
 
 			list ($new_temp_id, $live_id) = $this->_copyOneTempID($temp_id);
 			$live_ids[$index] = $live_id;
 
 			$this->_saveId('', Array ($temp_id => $live_id));
 			$this->_raiseEvent('OnAfterCopyToLive', '', Array ($temp_id => $live_id));
 
 			$this->_updateChangeLogForeignKeys($live_id, $temp_id);
 
 			foreach ($this->_subTables as $sub_table) {
 				$sub_table->subUpdateForeignKeys($live_id, $temp_id);
 			}
 
 			// delete only after sub-table foreign key update !
 			$this->_deleteOneTempID($new_temp_id);
 		}
 
 		$this->_setAsCopied();
 
 		// when all of ids in current master has been processed, copy all sub-tables data
 		foreach ($this->_subTables as $sub_table) {
 			$sub_table->subCopyToLive($live_ids, $temp_ids);
 		}
 	}
 
 	/**
 	 * Copies data from temp table that has no sub-tables all records together
 	 *
 	 * @param $temp_ids
 	 * @return void
 	 * @access protected
 	 */
 	protected function _copyTempToLiveWithoutSubTables($temp_ids)
 	{
 		$live_ids = Array ();
 		$this->_raiseEvent('OnBeforeCopyToLive', '', $temp_ids);
 
 		foreach ($temp_ids as $temp_id) {
 			if ( $temp_id > 0 ) {
 				$live_ids[$temp_id] = $temp_id;
 				// positive ids (already live) will be copied together below
 				continue;
 			}
 
 			// copy negative IDs (exists only in temp) one-by-one
 			list ($new_temp_id, $live_id) = $this->_copyOneTempID($temp_id);
 			$live_ids[$temp_id] = $live_id;
 
 			$this->_updateChangeLogForeignKeys($live_ids[$temp_id], $temp_id);
 			$this->_deleteOneTempID($new_temp_id);
 		}
 
 		// copy ALL records with positive ids (since negative ids were processed above) to live table
 		$sql = 'INSERT INTO ' . $this->_tableName . '
 				SELECT *
 				FROM ' . $this->_getTempTableName() . '
 				WHERE 1';
 		$this->Conn->Query($this->_addConstrain($sql));
 
 		$this->_saveId('', $live_ids);
 		$this->_raiseEvent('OnAfterCopyToLive', '', $live_ids);
 		$this->_setAsCopied();
 	}
 
 	/**
 	 * Copies one record with 0/negative ID from temp to live table to obtain it's live auto-increment id
 	 *
 	 * @param int $temp_id
 	 * @return Array Pair of temp id and live id
 	 * @access protected
 	 */
 	protected function _copyOneTempID($temp_id)
 	{
 		$copy_id = $temp_id;
 
 		if ( $temp_id < 0 ) {
 			$sql = 'UPDATE ' . $this->_getTempTableName() . '
 					SET ' . $this->_idField . ' = 0
 					WHERE ' . $this->_idField . ' = ' . $temp_id;
 			$this->Conn->Query($this->_addConstrain($sql));
 			$copy_id = 0;
 		}
 
 		$sql = 'INSERT INTO ' . $this->_tableName . '
 				SELECT *
 				FROM ' . $this->_getTempTableName() . '
 				WHERE ' . $this->_idField . ' = ' . $copy_id;
 		$this->Conn->Query($sql);
 
 		return Array ($copy_id, $copy_id == 0 ? $this->Conn->getInsertID() : $copy_id);
 	}
 
 	/**
 	 * Delete already copied record from master temp table
 	 *
 	 * @param int $temp_id
 	 * @return void
 	 * @access protected
 	 */
 	protected function _deleteOneTempID($temp_id)
 	{
 		$sql = 'DELETE FROM ' . $this->_getTempTableName() . '
 				WHERE ' . $this->_idField . ' = ' . $temp_id;
 		$this->Conn->Query($this->_addConstrain($sql));
 	}
 
 	/**
 	 * Deletes records from live table
 	 *
 	 * @param $ids
 	 * @return void
 	 * @access protected
 	 */
 	abstract protected function _deleteFromLive($ids);
 
 	/**
 	 * Ensures, that ids are always an array
 	 *
 	 * @param Array $ids
 	 * @return Array
 	 * @access protected
 	 */
 	protected function _parseTempIds($ids)
 	{
 		if ( !$ids ) {
 			$sql = 'SELECT ' . $this->_idField . '
 					FROM ' . $this->_getTempTableName() . '
 					WHERE 1';
 			$ids = $this->Conn->GetCol($this->_addConstrain($sql));
 		}
 
 		return $ids;
 	}
 
 	/**
 	 * Sets new parent event to the object
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access public
 	 */
 	public function setParentEvent(kEvent $event)
 	{
 		$this->_parentEvent = $event;
 		$this->_top()->_drillDown($this, 'setParentEvent');
 	}
 
 	/**
 	 * Collects information about table
 	 *
 	 * @return void
 	 * @access protected
 	 */
 	protected function _collectTableInfo()
 	{
 		$config = $this->Application->getUnitConfig($this->_prefix);
 
 		$this->_idField = $config->getIDField();
 		$this->_tableName = $config->getTableName();
 
 		$this->_foreignKey = $config->getForeignKey();
 		$this->_parentTableKey = $config->getParentTableKey();
 		$this->_constrain = $config->getConstrain('');
 
 		$this->_autoClone = $config->getAutoClone();
 		$this->_autoDelete = $config->getAutoDelete();
 	}
 
 	/**
 	 * Discovers and adds sub-tables to this table
 	 *
 	 * @return void
 	 * @access protected
 	 * @throws InvalidArgumentException
 	 */
 	protected function _addSubTables()
 	{
 		$sub_items = $this->Application->getUnitConfig($this->_prefix)->getSubItems(Array ());
 
 		if ( !is_array($sub_items) ) {
 			throw new InvalidArgumentException('TempHandler: SubItems property in unit config must be an array');
 		}
 
 		foreach ($sub_items as $sub_item_prefix) {
 			$this->add(new kTempHandlerSubTable($sub_item_prefix));
 		}
 	}
 
 	/**
 	 * Adds new sub-table
 	 *
 	 * @param kTempHandlerSubTable $table
 	 * @return void
 	 * @access public
 	 */
 	public function add(kTempHandlerSubTable $table)
 	{
 		if ( !$table->unitRegistered() ) {
 			trigger_error('TempHandler: unit "' . $table->_prefix . '" not registered', E_USER_WARNING);
 
 			return ;
 		}
 
 		$this->_subTables[] = $table;
 		$table->setParent($this);
 	}
 
 	/**
 	 * Finds sub-table by prefix.
 	 *
 	 * @param string $prefix Unit config prefix.
 	 *
 	 * @return kTempHandlerSubTable
 	 */
 	public function get($prefix)
 	{
 		if ( $this->_prefix == $prefix ) {
 			return $this;
 		}
 
 		foreach ( $this->_subTables as $sub_table ) {
 			$found_table = $sub_table->get($prefix);
 
 			if ( $found_table !== null ) {
 				return $found_table;
 			}
 		}
 
 		return null;
 	}
 
 	/**
 	 * Sets parent table
 	 *
 	 * @param kTempHandlerTable $parent
 	 * @return void
 	 * @access public
 	 */
 	public function setParent(kTempHandlerTable $parent)
 	{
 		$this->_parent = $parent;
 
 		if ( is_array($this->_foreignKey) ) {
 			$this->_multipleParents = true;
 			$this->_foreignKey = $this->_foreignKey[$parent->_prefix];
 		}
 
 		if ( is_array($this->_parentTableKey) ) {
 			$this->_parentTableKey = $this->_parentTableKey[$parent->_prefix];
 		}
 
 		$this->_setAsLastUsed();
 		$this->_addSubTables();
 	}
 
 	/**
 	 * Returns unit prefix
 	 *
 	 * @return string
 	 * @access public
 	 */
 	public function getPrefix()
 	{
 		return $this->_prefix;
 	}
 
 	/**
 	 * Determines if unit used to create table exists
 	 *
 	 * @return bool
 	 * @access public
 	 */
 	public function unitRegistered()
 	{
 		return $this->Application->prefixRegistred($this->_prefix);
 	}
 
 	/**
 	 * Returns topmost table
 	 *
 	 * @return kTempHandlerTopTable
 	 * @access protected
 	 */
 	protected function _top()
 	{
 		$top = $this;
 
 		while ( is_object($top->_parent) ) {
 			$top = $top->_parent;
 		}
 
 		return $top;
 	}
 
 	/**
 	 * Performs given operation on current table and all it's sub-tables
 	 *
 	 * @param kTempHandlerTable $table
 	 * @param string $operation
 	 * @param bool $same_table
 	 * @param bool $same_constrain
 	 * @return void
 	 * @access protected
 	 */
 	protected function _drillDown(kTempHandlerTable $table, $operation, $same_table = false, $same_constrain = false)
 	{
 		$table_match = $same_table ? $this->_tableName == $table->_tableName : true;
 		$constrain_match = $same_constrain ? $this->_constrain == $table->_constrain : true;
 
 		if ( $table_match && $constrain_match ) {
 			switch ( $operation ) {
 				case 'state:copied':
 					$this->_addState(self::STATE_COPIED);
 					break;
 
 				case 'state:deleted':
 					$this->_addState(self::STATE_DELETED);
 					break;
 
 				case 'setParentEvent':
 					$this->_parentEvent = $table->_parentEvent;
 					break;
 
 				case 'resetLastUsed':
 					$this->_lastUsage = false;
 					break;
 			}
 		}
 
 		foreach ($this->_subTables as $sub_table) {
 			$sub_table->_drillDown($table, $operation, $same_table, $same_constrain);
 		}
 	}
 
 	/**
 	 * Marks this instance of a table as it's last usage
 	 *
 	 * @return void
 	 * @access protected
 	 */
 	protected function _setAsLastUsed()
 	{
 		$this->_top()->_drillDown($this, 'resetLastUsed', true, true);
 		$this->_lastUsage = true;
 	}
 
 	/**
 	 * Marks table and all it's clones as copied
 	 *
 	 * @return void
 	 * @access protected
 	 */
 	protected function _setAsCopied()
 	{
 		$this->_top()->_drillDown($this, 'state:copied', true, true);
 	}
 
 	/**
 	 * Update foreign key columns after new ids were assigned instead of temporary ids in change log
 	 *
 	 * @param int $live_id
 	 * @param int $temp_id
 	 */
 	function _updateChangeLogForeignKeys($live_id, $temp_id)
 	{
 		if ( $live_id == $temp_id ) {
 			return;
 		}
 
 		$main_prefix = $this->Application->GetTopmostPrefix($this->_prefix);
 		$ses_var_name = $main_prefix . '_changes_' . $this->Application->GetTopmostWid($this->_prefix);
 		$changes = $this->Application->RecallVar($ses_var_name);
 		$changes = $changes ? unserialize($changes) : Array ();
 
 		foreach ($changes as $key => $rec) {
 			if ( $rec['Prefix'] == $this->_prefix && $rec['ItemId'] == $temp_id ) {
 				// main item change log record
 				$changes[$key]['ItemId'] = $live_id;
 			}
 
 			if ( $rec['MasterPrefix'] == $this->_prefix && $rec['MasterId'] == $temp_id ) {
 				// sub item change log record
 				$changes[$key]['MasterId'] = $live_id;
 			}
 
 			if ( in_array($this->_prefix, $rec['ParentPrefix']) && $rec['ParentId'][$this->_prefix] == $temp_id ) {
 				// parent item change log record
 				$changes[$key]['ParentId'][$this->_prefix] = $live_id;
 
 				if ( array_key_exists('DependentFields', $rec) ) {
 					// these are fields from table of $rec['Prefix'] table!
 					// when one of dependent fields goes into idfield of it's parent item, that was changed
 					$config = $this->Application->getUnitConfig($rec['Prefix']);
 
 					$parent_table_key = $config->getParentTableKey($this->_prefix);
 
 					if ( $parent_table_key == $this->_idField ) {
 						$foreign_key = $config->getForeignKey($this->_prefix);
 
 						$changes[$key]['DependentFields'][$foreign_key] = $live_id;
 					}
 				}
 			}
 		}
 
 		$this->Application->StoreVar($ses_var_name, serialize($changes));
 	}
 
 	/**
 	 * Returns foreign key pairs for given ids and $sub_table
 	 *
 	 * USE: MainTable
 	 *
 	 * @param kTempHandlerSubTable $sub_table
 	 * @param int|Array $live_id
 	 * @param int|Array $temp_id
 	 * @return Array
 	 * @access protected
 	 */
 	protected function _getForeignKeys(kTempHandlerSubTable $sub_table, $live_id, $temp_id = null)
 	{
 		$single_mode = false;
 
 		if ( !is_array($live_id) ) {
 			$single_mode = true;
 			$live_id = Array ($live_id);
 		}
 
 		if ( isset($temp_id) && !is_array($temp_id) ) {
 			$temp_id = Array ($temp_id);
 		}
 
 		$cache_key = serialize($live_id);
 		$parent_key_field = $sub_table->_parentTableKey ? $sub_table->_parentTableKey : $this->_idField;
 		$cached = getArrayValue($this->_foreignKeyCache, $parent_key_field);
 
 		if ( $cached ) {
 			if ( array_key_exists($cache_key, $cached) ) {
 				list($live_foreign_key, $temp_foreign_key) = $cached[$cache_key];
 
 				return $single_mode ? Array ($live_foreign_key[0], $temp_foreign_key[0]) : $live_foreign_key;
 			}
 		}
 
 		if ( $parent_key_field != $this->_idField ) {
 			$sql = 'SELECT ' . $parent_key_field . '
 					FROM ' . $this->_tableName . '
 					WHERE ' . $this->_idField . ' IN (' . implode(',', $live_id) . ')';
 			$live_foreign_key = $this->Conn->GetCol($sql);
 
 			if ( isset($temp_id) ) {
 				// because doCopyTempToLive resets negative IDs to 0 in temp table (one by one) before copying to live
 				$temp_key = $temp_id < 0 ? 0 : $temp_id;
 
 				$sql = 'SELECT ' . $parent_key_field . '
 						FROM ' . $this->_getTempTableName() . '
 						WHERE ' . $this->_idField . ' IN (' . implode(',', $temp_key) . ')';
 				$temp_foreign_key = $this->Conn->GetCol($sql);
 			}
 			else {
 				$temp_foreign_key = Array ();
 			}
 		}
 		else {
 			$live_foreign_key = $live_id;
 			$temp_foreign_key = $temp_id;
 		}
 
 		$this->_foreignKeyCache[$parent_key_field][$cache_key] = Array ($live_foreign_key, $temp_foreign_key);
 
 		if ( $single_mode ) {
 			return Array ($live_foreign_key[0], $temp_foreign_key[0]);
 		}
 
 		return $live_foreign_key;
 	}
 
 	/**
 	 * Adds constrain to given sql
 	 *
 	 * @param $sql
 	 * @return string
 	 * @access protected
 	 */
 	protected function _addConstrain($sql)
 	{
 		if ( $this->_constrain ) {
 			$sql .= ' AND ' . $this->_constrain;
 		}
 
 		return $sql;
 	}
 
 	/**
 	 * Creates temp table
 	 * Don't use CREATE TABLE ... LIKE because it also copies indexes
 	 *
 	 * @return void
 	 * @access protected
 	 */
 	protected function _create()
 	{
 		$sql = 'CREATE TABLE ' . $this->_getTempTableName() . '
 				SELECT *
 				FROM ' . $this->_tableName . '
 				WHERE 0';
 		$this->Conn->Query($sql);
 	}
 
 	/**
 	 * Deletes temp table
 	 *
 	 * @return bool
 	 * @access protected
 	 */
 	protected function _delete()
 	{
 		if ( $this->_inState(self::STATE_DELETED) ) {
 			return false;
 		}
 
 		$sql = 'DROP TABLE IF EXISTS ' . $this->_getTempTableName();
 		$this->Conn->Query($sql);
 
 		$this->_top()->_drillDown($this, 'state:deleted', true);
 
 		return true;
 	}
 
 	/**
 	 * Deletes table and all it's sub-tables
 	 *
 	 * @return void
 	 * @access public
 	 */
 	public function deleteAll()
 	{
 		$this->_delete();
 
 		foreach ($this->_subTables as $sub_table) {
 			$sub_table->deleteAll();
 		}
 	}
 
 	/**
 	 * Returns temp table name for current table
 	 *
 	 * @return string
 	 * @access protected
 	 */
 	protected function _getTempTableName()
 	{
 		return $this->Application->GetTempName($this->_tableName, $this->_windowID);
 	}
 
 	/**
 	 * Adds table state
 	 *
 	 * @param int $state
 	 * @return kTempHandlerTable
 	 * @access protected
 	 */
 	protected function _addState($state)
 	{
 		$this->_state |= $state;
 
 		return $this;
 	}
 
 	/**
 	 * Removes table state
 	 *
 	 * @param int $state
 	 * @return kTempHandlerTable
 	 * @access protected
 	 */
 	protected function _removeState($state)
 	{
 		$this->_state = $this->_state &~ $state;
 
 		return $this;
 	}
 
 	/**
 	 * Checks that table has given state
 	 *
 	 * @param int $state
 	 * @return bool
 	 * @access protected
 	 */
 	protected function _inState($state)
 	{
 		return ($this->_state & $state) == $state;
 	}
 
 	/**
 	 * Saves id for later usage
 	 *
 	 * @param string $special
 	 * @param int|Array $id
 	 * @return void
 	 * @access protected
 	 */
 	protected function _saveId($special = '', $id = null)
 	{
 		if ( !isset($this->_savedIds[$special]) ) {
 			$this->_savedIds[$special] = Array ();
 		}
 
 		if ( is_array($id) ) {
 			foreach ($id as $tmp_id => $live_id) {
 				$this->_savedIds[$special][$tmp_id] = $live_id;
 			}
 		}
 		else {
 			$this->_savedIds[$special][] = $id;
 		}
 	}
 
 	/**
 	 * Returns saved ids for given special.
 	 *
 	 * @param string $special Special.
 	 *
 	 * @return array
 	 */
 	public function getSavedIds($special = '')
 	{
 		return isset($this->_savedIds[$special]) ? $this->_savedIds[$special] : Array ();
 	}
 
 	/**
 	 * Raises event using IDs, that are currently being processed in temp handler
 	 *
 	 * @param string $name
 	 * @param string $special
 	 * @param Array $ids
 	 * @param string $foreign_key
 	 * @param Array $add_params
 	 * @return bool
 	 * @access protected
 	 */
 	protected function _raiseEvent($name, $special, $ids, $foreign_key = null, $add_params = null)
 	{
 		if ( !is_array($ids) ) {
 			return true;
 		}
 
 		$event = new kEvent($this->_prefix . ($special ? '.' : '') . $special . ':' . $name);
 		$event->MasterEvent = $this->_parentEvent;
 
 		if ( isset($foreign_key) ) {
 			$event->setEventParam('foreign_key', $foreign_key);
 		}
 
 		$set_temp_id = ($name == 'OnAfterCopyToLive') && (!is_array($add_params) || !array_key_exists('temp_id', $add_params));
 
 		foreach ($ids as $index => $id) {
 			$event->setEventParam('id', $id);
 
 			if ( $set_temp_id ) {
 				$event->setEventParam('temp_id', $index);
 			}
 
 			if ( is_array($add_params) ) {
 				foreach ($add_params as $name => $val) {
 					$event->setEventParam($name, $val);
 				}
 			}
 
 			$this->Application->HandleEvent($event);
 		}
 
 		return $event->status == kEvent::erSUCCESS;
 	}
 }
 
 
 /**
  * Represents topmost table, that has related tables inside it
  *
  * Pattern: Composite
  */
 class kTempHandlerTopTable extends kTempHandlerTable {
 
 	/**
 	 * Creates table object
 	 *
 	 * @param string $prefix
 	 * @param Array $ids
 	 */
 	public function __construct($prefix, $ids = Array ())
 	{
 		parent::__construct($prefix, $ids);
 
 		// editing sub-item, linked to multiple parents directly
 		if ( is_array($this->_foreignKey) ) {
 			$this->_multipleParents = true;
 			$this->_foreignKey = reset($this->_foreignKey);
 		}
 
 		if ( is_array($this->_parentTableKey) ) {
 			$this->_parentTableKey = reset($this->_parentTableKey);
 		}
 
 		$this->_setAsLastUsed();
 		$this->_addSubTables();
 	}
 
 	/**
 	 * Ensures, that ids are always an array
 	 *
 	 * @param array $ids IDs.
 	 *
 	 * @return array
 	 */
 	public function parseTempIds($ids)
 	{
 		return $this->_parseTempIds($ids);
 	}
 
 	/**
 	 * Checks, that someone is editing selected records and returns true, when no one.
 	 *
 	 * @param Array $ids
 	 * @return bool
 	 * @access public
 	 */
 	public function checkSimultaneousEdit($ids = null)
 	{
 		if ( !$this->Application->getUnitConfig($this->_prefix)->getCheckSimulatniousEdit() ) {
 			return true;
 		}
 
 		$tables = $this->Conn->GetCol('SHOW TABLES');
 		$mask_edit_table = '/' . TABLE_PREFIX . 'ses_(.*)_edit_' . $this->_tableName . '$/';
 
 		$my_sid = $this->Application->GetSID();
 		$my_wid = $this->Application->GetVar('m_wid');
 		$ids = implode(',', isset($ids) ? $ids : $this->_ids);
 
 		$sids = Array ();
 
 		if ( !$ids ) {
 			return true;
 		}
 
 		foreach ($tables as $table) {
 			if ( !preg_match($mask_edit_table, $table, $regs) ) {
 				continue;
 			}
 
 			// remove popup's wid from sid
 			$sid = preg_replace('/(.*)_(.*)/', '\\1', $regs[1]);
 
 			if ( $sid == $my_sid ) {
 				if ( $my_wid ) {
 					// using popups for editing
 					if ( preg_replace('/(.*)_(.*)/', '\\2', $regs[1]) == $my_wid ) {
 						// don't count window, that is being opened right now
 						continue;
 					}
 				}
 				else {
 					// not using popups for editing -> don't count my session tables
 					continue;
 				}
 			}
 
 			$sql = 'SELECT COUNT(' . $this->_idField . ')
 					FROM ' . $table . '
 					WHERE ' . $this->_idField . ' IN (' . $ids . ')';
 			$found = $this->Conn->GetOne($sql);
 
 			if ( !$found || in_array($sid, $sids) ) {
 				continue;
 			}
 
 			$sids[] = $sid;
 		}
 
 		if ( !$sids ) {
 			return true;
 		}
 
 		// detect who is it
 		$sql = 'SELECT	CONCAT(
 							(CASE s.PortalUserId WHEN ' . USER_ROOT . ' THEN "root" WHEN ' . USER_GUEST . ' THEN "Guest" ELSE CONCAT(u.FirstName, " ", u.LastName, " (", u.Username, ")") END),
 							" IP: ", s.IpAddress
 						)
 				FROM ' . TABLE_PREFIX . 'UserSessions AS s
 				LEFT JOIN ' . TABLE_PREFIX . 'Users AS u ON u.PortalUserId = s.PortalUserId
 				WHERE s.SessionKey IN (' . implode(',', $sids) . ')';
 		$users = $this->Conn->GetCol($sql);
 
 		if ( $users ) {
 			$this->Application->SetVar('_simultaneous_edit_message',
 				sprintf($this->Application->Phrase('la_record_being_edited_by'), implode(",\n", $users))
 			);
 
 			return false;
 		}
 
 		return true;
 	}
 
 	/**
 	 * Deletes records from live table
 	 *
 	 * @param $ids
 	 * @return void
 	 * @access protected
 	 */
 	protected function _deleteFromLive($ids)
 	{
 		if ( !$this->_raiseEvent('OnBeforeDeleteFromLive', '', $ids) ) {
 			return;
 		}
 
 		$sql = 'DELETE FROM ' . $this->_tableName . '
 				WHERE ' . $this->_idField . ' IN (' . implode(',', $ids) . ')';
 		$this->Conn->Query($sql);
 	}
 }
 
 
 /**
  * Represents sub table, that has related tables inside it
  *
  * Pattern: Composite
  */
 class kTempHandlerSubTable extends kTempHandlerTable {
 
 	/**
 	 * Deletes records from live table
 	 *
 	 * @param $ids
 	 * @return void
 	 * @access protected
 	 */
 	protected function _deleteFromLive($ids)
 	{
 		// for sub-tables records get deleted in "subCopyToLive" method !BY Foreign Key!
 	}
 
 	/**
 	 * Copies sub-table contents to live
 	 *
 	 * @param Array $live_ids
 	 * @param Array $temp_ids
 	 * @return void
 	 * @access public
 	 */
 	public function subCopyToLive($live_ids, $temp_ids)
 	{
 		// delete records from live table by foreign key, so that records deleted from temp table
 		// get deleted from live
 		if ( $temp_ids && !$this->_inState(self::STATE_COPIED) ) {
 			if ( !$this->_foreignKey ) {
 				return;
 			}
 
 			$foreign_keys = $this->_parent->_getForeignKeys($this, $live_ids, $temp_ids);
 
 			if ( count($foreign_keys) > 0 ) {
 				$sql = 'SELECT ' . $this->_idField . '
 						FROM ' . $this->_tableName . '
 						WHERE ' . $this->_foreignKey . ' IN (' . implode(',', $foreign_keys) . ')';
 				$ids = $this->Conn->GetCol($this->_addConstrain($sql));
 
 				if ( $this->_raiseEvent('OnBeforeDeleteFromLive', '', $ids, $foreign_keys) ) {
 					$sql = 'DELETE FROM ' . $this->_tableName . '
 							WHERE ' . $this->_foreignKey . ' IN (' . implode(',', $foreign_keys) . ')';
 					$this->Conn->Query($this->_addConstrain($sql));
 				}
 			}
 		}
 
 		// sub_table passed here becomes master in the method, and recursively updated and copy its sub tables
 		$this->doCopyTempToLive();
 	}
 
 	/**
 	 * Deletes unit db records and it's sub-items by foreign key
 	 *
 	 * @param kDBItem $object
 	 * @param string $special
 	 * @param Array $original_values
 	 * @return void
 	 * @access public
 	 */
 	public function subDeleteItems(kDBItem $object, $special, $original_values)
 	{
 		if ( !$this->_autoDelete || !$this->_foreignKey || !$this->_parentTableKey ) {
 			return;
 		}
 
 		$table_name = $object->IsTempTable() ? $this->_getTempTableName() : $this->_tableName;
 
 		$sql = 'SELECT ' . $this->_idField . '
 				FROM ' . $table_name . '
 				WHERE ' . $this->_foreignKey . ' = ' . $original_values[$this->_parentTableKey];
 		$sub_ids = $this->Conn->GetCol($sql);
 
 		$this->doDeleteItems($this->_prefix .'.' . $special, $sub_ids);
 	}
 
 	/**
 	 * Clones unit db records and it's sub-items by foreign key
 	 *
 	 * @param kDBItem $object
 	 * @param Array $original_values
 	 * @return void
 	 * @access public
 	 */
 	public function subCloneItems(kDBItem $object, $original_values)
 	{
 		if ( !$this->_autoClone || !$this->_foreignKey || !$this->_parentTableKey ) {
 			return;
 		}
 
 		$table_name = $object->IsTempTable() ? $this->_getTempTableName() : $this->_tableName;
 
 		$sql = 'SELECT ' . $this->_idField . '
 				FROM ' . $table_name . '
 				WHERE ' . $this->_foreignKey . ' = ' . $original_values[$this->_parentTableKey];
 		$sub_ids = $this->Conn->GetCol($this->_addConstrain($sql));
 
 		if ( $this->_multipleParents ) {
 			// $sub_ids could contain newly cloned items, we need to remove it here to escape double cloning
 			$cloned_ids = getArrayValue(self::$_clonedIds, $this->_tableName);
 
 			if ( !$cloned_ids ) {
 				$cloned_ids = Array ();
 			}
 
 			$sub_ids = array_diff($sub_ids, array_values($cloned_ids));
 		}
 
 		$parent_key = $object->GetDBField($this->_parentTableKey);
 
 		$this->doCloneItems($this->_prefix . '.' . $object->Special, $sub_ids, $parent_key);
 	}
 
 	/**
 	 * Update foreign key columns after new ids were assigned instead of temporary ids in db
 	 *
 	 * @param int $live_id
 	 * @param int $temp_id
 	 * @return void
 	 * @access public
 	 */
 	public function subUpdateForeignKeys($live_id, $temp_id)
 	{
 		if ( !$this->_foreignKey ) {
 			return;
 		}
 
 		list ($live_foreign_key, $temp_foreign_key) = $this->_parent->_getForeignKeys($this, $live_id, $temp_id);
 
 		// update ForeignKey in temporary sub-table
 		if ( $live_foreign_key == $temp_foreign_key ) {
 			return;
 		}
 
 		$sql = 'UPDATE ' . $this->_getTempTableName() . '
 				SET ' . $this->_foreignKey . ' = ' . $live_foreign_key . '
 				WHERE ' . $this->_foreignKey . ' = ' . $temp_foreign_key;
 		$this->Conn->Query($this->_addConstrain($sql));
 	}
 }
Index: branches/5.3.x/core/kernel/utility/http_query.php
===================================================================
--- branches/5.3.x/core/kernel/utility/http_query.php	(revision 16518)
+++ branches/5.3.x/core/kernel/utility/http_query.php	(revision 16519)
@@ -1,792 +1,792 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class kHTTPQuery extends Params {
 
 	/**
 	 * Cache of QueryString parameters
 	 * from config, that are represented
 	 * in environment variable
 	 *
 	 * @var Array
 	 */
 	protected $discoveredUnits = Array ();
 
 	/**
 	 * $_POST vars
 	 *
 	 * @var Array
 	 * @access private
 	 */
 	var $Post;
 
 	/**
 	 * $_GET vars
 	 *
 	 * @var Array
 	 * @access private
 	 */
 	var $Get;
 
 	/**
 	 * $_COOKIE vars
 	 *
 	 * @var Array
 	 * @access private
 	 */
 	var $Cookie;
 
 	/**
 	 * $_SERVER vars
 	 *
 	 * @var Array
 	 * @access private
 	 */
 	var $Server;
 
 	/**
 	 * $_ENV vars
 	 *
 	 * @var Array
 	 * @access private
 	 */
 	var $Env;
 
 	/**
 	 * Order in what write
 	 * all vars together in
 	 * the same array
 	 *
 	 * @var string
 	 */
 	var $Order;
 
 	/**
 	 * Uploaded files info
 	 *
 	 * @var Array
 	 * @access private
 	 */
 	var $Files;
 
 	var $specialsToRemove = Array();
 
 	/**
 	 * SessionID is given via "sid" variable in query string
 	 *
 	 * @var bool
 	 */
 	var $_sidInQueryString = false;
 
 	/**
 	 * Trust information, provided by proxy
 	 *
 	 * @var bool
 	 */
 	protected $_trustProxy = false;
 
 	/**
 	 * Loads info from $_POST, $_GET and
 	 * related arrays into common place
 	 *
 	 * @param string $order
 	 * @access public
 	 */
 	public function __construct($order = 'CGPF')
 	{
 		parent::__construct();
 
 		$this->Order = $order;
 
 		if ( isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest') {
 			// when AJAX request is made from jQuery, then create ajax variable,
 			// so any logic based in it (like redirects) will not break down
 			$_GET['ajax'] = 'yes';
 		}
 
 		$this->_trustProxy = kUtil::getSystemConfig()->get('TrustProxy');
 	}
 
 	/**
 	 * Discovers unit form request and returns it's QueryString option on success
 	 *
 	 * @param string $prefix_special
 	 *
 	 * @return Array|bool
 	 * @access public
 	 */
 	public function discoverUnit($prefix_special)
 	{
 		list($prefix) = explode('.', $prefix_special);
 
 		$query_string = $this->getQueryString($prefix);
 
 		if ($query_string) {
 			// only units with QueryString option can be discovered
 			$this->discoveredUnits[$prefix_special] = $query_string;
 
 			return $query_string;
 		}
 
 		unset( $this->discoveredUnits[$prefix] );
 
 		return false;
 	}
 
 	/**
 	 * Returns units, passed in request
 	 *
 	 * @param bool $prefix_special_only
 	 * @return Array
 	 * @access protected
 	 */
 	public function getDiscoveredUnits($prefix_special_only = true)
 	{
 		return $prefix_special_only ? array_keys( $this->discoveredUnits ) : $this->discoveredUnits;
 	}
 
 	/**
 	 * Returns QueryMap for requested unit config.
 	 * In case if unit config is a clone, then get parent item's (from prefix) config to create clone
 	 *
 	 * @param string $prefix
 	 * @return Array
 	 * @access protected
 	 */
 	protected function getQueryString($prefix)
 	{
 		return $this->Application->getUnitConfig($prefix)->getQueryString(Array ());
 	}
 
 	/**
 	 * Removes specials from request
 	 *
 	 * @param Array $array
 	 * @return Array
 	 * @access protected
 	 */
 	protected function _removeSpecials($array)
 	{
 		$ret = Array ();
 		$removed = false;
 
 		foreach ($this->specialsToRemove as $prefix_special => $flag) {
 			if ( $flag ) {
 				$removed = true;
 				list ($prefix, $special) = explode('.', $prefix_special, 2);
 
 				foreach ($array as $key => $val) {
 					$new_key = preg_match("/^" . $prefix . "[._]{1}" . $special . "(.*)/", $key, $regs) ? $prefix . $regs[1] : $key;
 					$ret[$new_key] = is_array($val) ? $this->_removeSpecials($val) : $val;
 				}
 			}
 		}
 
 		return $removed ? $ret : $array;
 	}
 
 	public function process()
 	{
 		$this->AddAllVars();
 		$this->removeSpecials();
 		ini_set('magic_quotes_gpc', 0);
 
 		$this->Application->UrlManager->LoadStructureTemplateMapping();
 
 		$this->AfterInit();
 	}
 
 	/**
 	 * All all requested vars to
 	 * common storage place
 	 *
 	 * @return void
 	 * @access protected
 	 */
 	protected function AddAllVars()
 	{
 		for ($i = 0; $i < strlen($this->Order); $i++) {
 			switch ($this->Order[$i]) {
 				case 'G':
 					$this->Get = $this->AddVars($_GET);
 					if ( array_key_exists('sid', $_GET) ) {
 						$this->_sidInQueryString = true;
 					}
 
 					$vars = $this->Application->processQueryString($this->Get(ENV_VAR_NAME));
 
 					if ( array_key_exists('sid', $vars) ) {
 						// used by Session::GetPassedSIDValue
 						$this->Get['sid'] = $vars['sid'];
 					}
 
 					$this->AddParams($vars);
 					break;
 
 				case 'P':
 					$this->Post = $this->AddVars($_POST);
 					$this->convertPostEvents();
 					$this->_processPostEnvVariables();
 					break;
 
 				case 'C':
 					$cookie_hasher = $this->Application->makeClass('kCookieHasher');
 					/* @var $cookie_hasher kCookieHasher */
 
 					$parsed_cookies = Array ();
 
 					foreach ($_COOKIE as $cookie_name => $encrypted_value) {
 						$parsed_cookies[$cookie_name] = $cookie_hasher->decrypt($cookie_name, $encrypted_value);
 					}
 
 					$this->Cookie = $this->AddVars($parsed_cookies);
 					break;
 
 				/*case 'E';
 					$this->Env = $this->AddVars($_ENV, false); //do not strip slashes!
 					break;
 
 				case 'S';
 					$this->Server = $this->AddVars($_SERVER, false); //do not strip slashes!
 					break;*/
 
 				case 'F';
 					$this->convertFiles();
 					$this->Files = $this->MergeVars($_FILES); // , false); //do not strip slashes!
 					break;
 			}
 		}
 	}
 
 	/**
 	 * Allow POST variables, that names were transformed by PHP ("." replaced with "_") to
 	 * override variables, that were virtually created through environment variable parsing
 	 *
 	 */
 	function _processPostEnvVariables()
 	{
 		$passed = $this->Get('passed');
 		if ( !$passed ) {
 			return;
 		}
 
 		$passed = explode(',', $passed);
 		foreach ($passed as $prefix_special) {
 			if ( strpos($prefix_special, '.') === false ) {
 				continue;
 			}
 
 			list ($prefix, $special) = explode('.', $prefix_special);
 			$query_map = $this->getQueryString($prefix);
 			$post_prefix_special = $prefix . '_' . $special;
 
 			foreach ($query_map as $var_name) {
 				if ( array_key_exists($post_prefix_special . '_' . $var_name, $this->Post) ) {
 					$this->Set($prefix_special . '_' . $var_name, $this->Post[$post_prefix_special . '_' . $var_name]);
 				}
 			}
 		}
 	}
 
 	/**
 	 * Removes requested specials from all request variables
 	 *
 	 * @return void
 	 * @access protected
 	 */
 	protected function removeSpecials()
 	{
 		$this->specialsToRemove = $this->Get('remove_specials');
 
 		if ( $this->specialsToRemove ) {
 			foreach ($this->specialsToRemove as $prefix_special => $flag) {
 				if ( $flag && strpos($prefix_special, '.') === false ) {
 					unset($this->specialsToRemove[$prefix_special]);
 					trigger_error('Incorrect usage of "<strong>remove_specials[' . $prefix_special . ']</strong>" field (no special found)', E_USER_NOTICE);
 				}
 			}
 
 			$this->_Params = $this->_removeSpecials($this->_Params);
 		}
 	}
 
 	/**
 	 * Finishes initialization of kHTTPQuery class.
 	 *
 	 * @return void
 	 */
 	protected function AfterInit()
 	{
 		$rewrite_url = $this->Get('_mod_rw_url_');
 
 		if ( $this->Application->RewriteURLs() || $rewrite_url ) {
 			// maybe call onafterconfigread here
 
 			$this->Application->UrlManager->initRewrite();
 
 			if ( defined('DEBUG_MODE') && $this->Application->isDebugMode() ) {
 				$this->Application->Debugger->profileStart('url_parsing', 'Parsing <b>MOD_REWRITE</b> url');
 				$this->Application->UrlManager->rewrite->parseRewriteURL();
 				$description = 'Parsing <b>MOD_REWRITE</b> url (template: <b>' . $this->Get('t') . '</b>)';
 				$this->Application->Debugger->profileFinish('url_parsing', $description);
 			}
 			else {
 				$this->Application->UrlManager->rewrite->parseRewriteURL();
 			}
 
 			if ( !$rewrite_url && $this->rewriteRedirectRequired() ) {
 				// rewrite url is missing (e.g. not a script from tools folder)
 				$url_params = $this->getRedirectParams();
 
 				// no idea about how to check, that given template require category to be passed with it, so pass anyway
 				$url_params['pass_category'] = 1;
 				$url_params['response_code'] = 301; // Moved Permanently
 
 				trigger_error('Non mod-rewrite url "<strong>' . $_SERVER['REQUEST_URI'] . '</strong>" used', E_USER_NOTICE);
 				$this->Application->Redirect('', $url_params);
 			}
 		}
 		else {
 			$this->Application->VerifyThemeId();
 			$this->Application->VerifyLanguageId();
 		}
 
 		$virtual_template = $this->Application->getVirtualPageTemplate($this->Get('m_cat_id'));
 
 		if ( ($virtual_template !== false) && preg_match('/external:(.*)/', $virtual_template) ) {
 			trigger_error('URL of page, that has "External URL" set was accessed: "<strong>' . $_SERVER['REQUEST_URI'] . '</strong>"', E_USER_NOTICE);
 			$this->Application->Redirect($virtual_template);
 		}
 
 		if ( !$this->Application->isAdmin && $this->Application->ConfigValue('ForceCanonicalUrls') ) {
 			$template = $this->Application->GetVar('t');
 			$seo_template = $this->Application->getSeoTemplate($template);
 
 			if ( $seo_template && $seo_template != $template ) {
 				$url_params = $this->getRedirectParams();
 				$url_params['response_code'] = 301;
 
 				trigger_error('Request url "<strong>' . $_SERVER['REQUEST_URI'] . '</strong>" points directly to physical template', E_USER_NOTICE);
 				$this->Application->Redirect($seo_template, $url_params);
 			}
 		}
 	}
 
 	/**
 	 * Checks, that non-rewrite url was visited and it's automatic rewrite is required
 	 *
 	 * @return bool
 	 */
 	function rewriteRedirectRequired()
 	{
 		$redirect_conditions = Array (
 			!$this->IsHTTPSRedirect(), // not https <-> http redirect
 			!$this->refererIsOurSite(), // referer doesn't match ssl path or non-ssl domain (same for site domains)
 			!defined('GW_NOTIFY'), // not in payment gateway notification script
 			preg_match('/[\/]{0,1}index.php[\/]{0,1}/', $_SERVER['PHP_SELF']), // "index.php" was visited
 			$this->Get('t') != 'index', // not on index page
 		);
 
 		$perform_redirect = true;
 
 		foreach ($redirect_conditions as $redirect_condition) {
 			$perform_redirect = $perform_redirect && $redirect_condition;
 
 			if (!$perform_redirect) {
 				return false;
 			}
 		}
 
 		return true;
 	}
 
 	/**
 	 * This is redirect from https to http or via versa
 	 *
 	 * @return bool
 	 */
 	function IsHTTPSRedirect()
 	{
 		$http_referer = array_key_exists('HTTP_REFERER', $_SERVER) ? $_SERVER['HTTP_REFERER'] : false;
 
 		return (
 			( PROTOCOL == 'https://' && preg_match('#http:\/\/#', $http_referer) )
 			||
 			( PROTOCOL == 'http://' && preg_match('#https:\/\/#', $http_referer) )
 		);
 	}
 
 	/**
 	 * Checks, that referer is out site
 	 *
 	 * @return bool
 	 */
 	function refererIsOurSite()
 	{
 		if ( !array_key_exists('HTTP_REFERER', $_SERVER) ) {
 			// no referer -> don't care what happens
 			return false;
 		}
 
+		/** @var SiteHelper $site_helper */
 		$site_helper = $this->Application->recallObject('SiteHelper');
-		/* @var $site_helper SiteHelper */
 
 		$parsed_url = parse_url($_SERVER['HTTP_REFERER']);
 
 		if ( $parsed_url['scheme'] == 'https' ) {
 			$found = $site_helper->compare($parsed_url['host'], 'SSLDomainName', $this->Application->ConfigValue('SSLDomain'));
 		}
 		else {
 			$found = $site_helper->compare($parsed_url['host'], 'DomainName', DOMAIN);
 		}
 
 		return $found;
 	}
 
 	function convertFiles()
 	{
 		if ( !$_FILES ) {
 			return ;
 		}
 
 		$tmp = Array ();
 		$file_keys = Array ('error', 'name', 'size', 'tmp_name', 'type');
 
 		foreach ($_FILES as $file_name => $file_info) {
 			if ( is_array($file_info['error']) ) {
 				$tmp[$file_name] = $this->getArrayLevel($file_info['error'], $file_name);
 			}
 			else {
 				$normal_files[$file_name] = $file_info;
 			}
 		}
 
 		if ( !$tmp ) {
 			return ;
 		}
 
 		$files = $_FILES;
 		$_FILES = Array ();
 
 		foreach ($tmp as $prefix => $prefix_files) {
 			$anchor =& $_FILES;
 			foreach ($prefix_files['keys'] as $key) {
 				$anchor =& $anchor[$key];
 			}
 
 			foreach ($prefix_files['value'] as $field_name) {
 				unset($inner_anchor, $copy);
 				$work_copy = $prefix_files['keys'];
 
 				foreach ($file_keys as $file_key) {
 					$inner_anchor =& $files[$prefix][$file_key];
 
 					if ( isset($copy) ) {
 						$work_copy = $copy;
 					}
 					else {
 						$copy = $work_copy;
 					}
 
 					array_shift($work_copy);
 					foreach ($work_copy as $prefix_file_key) {
 						$inner_anchor =& $inner_anchor[$prefix_file_key];
 					}
 
 					$anchor[$field_name][$file_key] = $inner_anchor[$field_name];
 				}
 			}
 		}
 		// keys: img_temp, 0, values: LocalPath, ThumbPath
 	}
 
 	function getArrayLevel(&$level, $prefix='')
 	{
 		$ret['keys'] = $prefix ? Array($prefix) : Array();
 		$ret['value'] = Array();
 
 		foreach($level as $level_key => $level_value)
 		{
 			if( is_array($level_value) )
 			{
 				$ret['keys'][] = $level_key;
 				$tmp = $this->getArrayLevel($level_value);
 
 				$ret['keys'] = array_merge($ret['keys'], $tmp['keys']);
 				$ret['value'] = array_merge($ret['value'], $tmp['value']);
 			}
 			else
 			{
 				$ret['value'][] = $level_key;
 			}
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Overwrites GET events with POST events in case if they are set and not empty
 	 *
 	 * @return void
 	 * @access protected
 	 */
 	protected function convertPostEvents()
 	{
+		/** @var Array $events */
 		$events = $this->Get('events', Array ());
-		/* @var $events Array */
 
 		if ( is_array($events) ) {
 			$events = array_filter($events);
 
 			foreach ($events as $prefix_special => $event_name) {
 				$this->Set($prefix_special . '_event', $event_name);
 			}
 		}
 	}
 
 	function finalizeParsing($passed = Array())
 	{
 		if (!$passed) {
 			return;
 		}
 
 		foreach ($passed as $passed_prefix) {
 			$this->discoverUnit($passed_prefix); // from mod-rewrite url parsing
 		}
 
 		$this->Set('passed', implode(',', $this->getDiscoveredUnits()));
 	}
 
 	/**
 	 * Saves variables from array specified
 	 * into common variable storage place
 	 *
 	 * @param Array $array
 	 * @param bool $strip_slashes
 	 * @return Array
 	 * @access private
 	 */
 	function AddVars($array, $strip_slashes = true)
 	{
 		if ( $strip_slashes ) {
 			$array = $this->StripSlashes($array);
 		}
 
 		foreach ($array as $key => $value) {
 			$this->Set($key, $value);
 		}
 
 		return $array;
 	}
 
 	function MergeVars($array, $strip_slashes = true)
 	{
 		if ( $strip_slashes ) {
 			$array = $this->StripSlashes($array);
 		}
 
 		foreach ($array as $key => $value_array) {
 			// $value_array is an array too
 			$this->_Params = kUtil::array_merge_recursive($this->_Params, Array ($key => $value_array));
 		}
 
 		return $array;
 	}
 
 	function StripSlashes($array)
 	{
 		static $magic_quotes = null;
 
 		if (!isset($magic_quotes)) {
 			$magic_quotes = get_magic_quotes_gpc();
 		}
 
 		foreach ($array as $key => $value) {
 			if (is_array($value)) {
 				$array[$key] = $this->StripSlashes($value);
 			}
 			else {
 				if ($magic_quotes) {
 					$value = stripslashes($value);
 				}
 
 				if (!$this->Application->isAdmin) {
 					// TODO: always escape output instead of input
 					$value = kUtil::escape($value, kUtil::ESCAPE_HTML);
 				}
 
 				$array[$key] = $value;
 			}
 		}
 
 		return $array;
 	}
 
 	/**
 	 * Removes forceful escaping done to the variable upon Front-End submission.
 	 *
 	 * @param string|array $value Value.
 	 *
 	 * @return string|array
 	 * @see    StripSlashes
 	 */
 	public function unescapeRequestVariable($value)
 	{
 		if ( $this->Application->isAdmin ) {
 			return $value;
 		}
 
 		// This allows to revert kUtil::escape() call for each field submitted on front-end.
 		if ( is_array($value) ) {
 			foreach ( $value as $param_name => $param_value ) {
 				$value[$param_name] = $this->unescapeRequestVariable($param_value);
 			}
 
 			return $value;
 		}
 
 		return kUtil::unescape($value, kUtil::ESCAPE_HTML);
 	}
 
 	/**
 	 * Returns all $_GET array excluding system parameters, that are not allowed to be passed through generated urls
 	 *
 	 * @param bool $access_error Method is called during no_permission, require login, session expiration link preparation
 	 * @return Array
 	 */
 	function getRedirectParams($access_error = false)
 	{
 		$vars = $this->Get;
 		$unset_vars = Array (ENV_VAR_NAME, 'rewrite', '_mod_rw_url_', 'Action');
 
 		if (!$this->_sidInQueryString) {
 			$unset_vars[] = 'sid';
 		}
 
 		// remove system variables
 		foreach ($unset_vars as $var_name) {
 			if (array_key_exists($var_name, $vars)) {
 				unset($vars[$var_name]);
 			}
 		}
 
 		if ($access_error) {
 			// place 1 of 2 (also in UsersEventHandler::OnSessionExpire)
 			$vars = $this->_removePassThroughVariables($vars);
 		}
 
 		return $vars;
 	}
 
 	/**
 	 * Removes all pass_though variables from redirect params
 	 *
 	 * @param Array $url_params
 	 * @return Array
 	 */
 	function _removePassThroughVariables($url_params)
 	{
 		$pass_through = array_key_exists('pass_through', $url_params) ? $url_params['pass_through'] : '';
 		if (!$pass_through) {
 			return $url_params;
 		}
 
 		$pass_through = explode(',', $pass_through . ',pass_through');
 		foreach ($pass_through as $pass_through_var) {
 			unset($url_params[$pass_through_var]);
 		}
 
 		$url_params['no_pass_through'] = 1; // this way kApplication::HREF won't add them again
 
 		return $url_params;
 	}
 
 	/**
 	 * Checks, that url is empty
 	 *
 	 * @return bool
 	 * @access public
 	 */
 	public function isEmptyUrl()
 	{
 		if ( $this->Application->RewriteURLs() ) {
 			return !$this->Get('_mod_rw_url_');
 		}
 
 		return !count($this->Get);
 	}
 
 	/**
 	 * Returns the client IP address.
 	 *
 	 * @return string The client IP address
 	 * @access public
 	 */
 	public function getClientIp()
 	{
 		if ( $this->_trustProxy ) {
 			if ( array_key_exists('HTTP_CLIENT_IP', $_SERVER) ) {
 				return $_SERVER['HTTP_CLIENT_IP'];
 			}
 
 			if ( array_key_exists('HTTP_X_FORWARDED_FOR', $_SERVER) ) {
 				$client_ip = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
 
 				foreach ($client_ip as $ip_address) {
 					$clean_ip_address = trim($ip_address);
 
 					if ( false !== filter_var($clean_ip_address, FILTER_VALIDATE_IP) ) {
 						return $clean_ip_address;
 					}
 				}
 
 				return '';
 			}
 		}
 
 		return isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : '';
 	}
 
 	/**
 	 * Returns headers
 	 *
 	 * @return array
 	 * @access public
 	 */
 	public function getHeaders()
 	{
 		if ( function_exists('apache_request_headers') ) {
 			// If apache_request_headers() exists...
 			$headers = apache_request_headers();
 
 			if ( $headers ) {
 				return $headers; // And works... Use it
 			}
 		}
 
 		$headers = array();
 
 		foreach ( array_keys($_SERVER) as $server_key ) {
 			if ( substr($server_key, 0, 5) == 'HTTP_' ) {
 				$header_name = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($server_key, 0, 5)))));
 				$headers[$header_name] = $_SERVER[$server_key];
 			}
 		}
 
 		return $headers;
 	}
 
 }
Index: branches/5.3.x/core/kernel/utility/logger.php
===================================================================
--- branches/5.3.x/core/kernel/utility/logger.php	(revision 16518)
+++ branches/5.3.x/core/kernel/utility/logger.php	(revision 16519)
@@ -1,1413 +1,1413 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2012 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 /**
  * Class for logging system activity
  */
 class kLogger extends kBase {
 
 	/**
 	 * Prefix of all database related errors
 	 */
 	const DB_ERROR_PREFIX = 'SQL Error:';
 
 	/**
 	 * Logger state: logging of errors and user-defined messages
 	 */
 	const STATE_ENABLED = 1;
 
 	/**
 	 * Logger state: logging of user-defined messages only
 	 */
 	const STATE_USER_ONLY = 2;
 
 	/**
 	 * Logger state: don't log anything
 	 */
 	const STATE_DISABLED = 0;
 
 	/**
 	 * Log store: automatically determine where log should be written
 	 */
 	const LS_AUTOMATIC = 1;
 
 	/**
 	 * Log store: always write log to database
 	 */
 	const LS_DATABASE = 2;
 
 	/**
 	 * Log store: always write log to disk
 	 */
 	const LS_DISK = 3;
 
 	/**
 	 * Log level: system is unusable
 	 */
 	const LL_EMERGENCY = 0;
 
 	/**
 	 * Log level: action must be taken immediately
 	 */
 	const LL_ALERT = 1;
 
 	/**
 	 * Log level: the system is in a critical condition
 	 */
 	const LL_CRITICAL = 2;
 
 	/**
 	 * Log level: there is an error condition
 	 */
 	const LL_ERROR = 3;
 
 	/**
 	 * Log level: there is a warning condition
 	 */
 	const LL_WARNING = 4;
 
 	/**
 	 * Log level: a normal but significant condition
 	 */
 	const LL_NOTICE = 5;
 
 	/**
 	 * Log level: a purely informational message
 	 */
 	const LL_INFO = 6;
 
 	/**
 	 * Log level: messages generated to debug the application
 	 */
 	const LL_DEBUG = 7;
 
 	/**
 	 * Log type: PHP related activity
 	 */
 	const LT_PHP = 1;
 
 	/**
 	 * Log type: database related activity
 	 */
 	const LT_DATABASE = 2;
 
 	/**
 	 * Log type: custom activity
 	 */
 	const LT_OTHER = 3;
 
 	/**
 	 * Log interface: Front
 	 */
 	const LI_FRONT = 1;
 
 	/**
 	 * Log interface: Admin
 	 */
 	const LI_ADMIN = 2;
 
 	/**
 	 * Log interface: Cron (Front)
 	 */
 	const LI_CRON_FRONT = 3;
 
 	/**
 	 * Log interface: Cron (Admin)
 	 */
 	const LI_CRON_ADMIN = 4;
 
 	/**
 	 * Log interface: API
 	 */
 	const LI_API = 5;
 
 	/**
 	 * Log notification status: disabled
 	 */
 	const LNS_DISABLED = 0;
 
 	/**
 	 * Log notification status: pending
 	 */
 	const LNS_PENDING = 1;
 
 	/**
 	 * Log notification status: sent
 	 */
 	const LNS_SENT = 2;
 
 	/**
 	 * List of error/exception handlers
 	 *
 	 * @var Array
 	 * @access protected
 	 */
 	protected $_handlers = Array ();
 
 	/**
 	 * Long messages are saved here, because "trigger_error" doesn't support error messages over 1KB in size
 	 *
 	 * @var Array
 	 * @access protected
 	 */
 	protected static $_longMessages = Array ();
 
 	/**
 	 * Log record being worked on
 	 *
 	 * @var Array
 	 * @access protected
 	 */
 	protected $_logRecord = Array ();
 
 	/**
 	 * Maximal level of a message, that can be logged
 	 *
 	 * @var int
 	 * @access protected
 	 */
 	protected $_maxLogLevel = self::LL_NOTICE;
 
 	/**
 	 * State of the logger
 	 *
 	 * @var int
 	 * @access protected
 	 */
 	protected $_state = self::STATE_DISABLED;
 
 	/**
 	 * Caches state of debug mode
 	 *
 	 * @var bool
 	 * @access protected
 	 */
 	protected $_debugMode = false;
 
 	/**
 	 * Ignores backtrace record where following classes/files are mentioned
 	 *
 	 * @var array
 	 */
 	protected $_ignoreInTrace = array(
 		'kLogger' => 'logger.php',
 		'kErrorHandlerStack' => 'logger.php',
 		'kExceptionHandlerStack' => 'logger.php',
 		'kDBConnection' => 'db_connection.php',
 		'kDBConnectionDebug' => 'db_connection.php',
 		'kDBLoadBalancer' => 'db_load_balancer.php',
 	);
 
 	/**
 	 * Create event log
 	 *
 	 * @param Array $methods_to_call List of invokable kLogger class method with their parameters (if any)
 	 * @access public
 	 */
 	public function __construct($methods_to_call = Array ())
 	{
 		parent::__construct();
 
 		$system_config = kUtil::getSystemConfig();
 
 		$this->_debugMode = $this->Application->isDebugMode();
 		$this->setState($system_config->get('EnableSystemLog', self::STATE_DISABLED));
 		$this->_maxLogLevel = $system_config->get('SystemLogMaxLevel', self::LL_NOTICE);
 
 		foreach ($methods_to_call as $method_to_call) {
 			call_user_func_array(Array ($this, $method_to_call[0]), $method_to_call[1]);
 		}
 
 		if ( !kUtil::constOn('DBG_ZEND_PRESENT') && !$this->Application->isDebugMode() ) {
 			// don't report error on screen if debug mode is turned off
 			error_reporting(0);
 			ini_set('display_errors', 0);
 		}
 
 		register_shutdown_function(Array ($this, 'catchLastError'));
 	}
 
 	/**
 	 * Sets state of the logged (enabled/user-only/disabled)
 	 *
 	 * @param $new_state
 	 * @return void
 	 * @access public
 	 */
 	public function setState($new_state = null)
 	{
 		if ( isset($new_state) ) {
 			$this->_state = (int)$new_state;
 		}
 
 		if ( $this->_state === self::STATE_ENABLED ) {
 			$this->_enableErrorHandling();
 		}
 		elseif ( $this->_state === self::STATE_DISABLED ) {
 			$this->_disableErrorHandling();
 		}
 	}
 
 	/**
 	 * Enable error/exception handling capabilities
 	 *
 	 * @return void
 	 * @access protected
 	 */
 	protected function _enableErrorHandling()
 	{
 		$this->_disableErrorHandling();
 
 		$this->_handlers[self::LL_ERROR] = new kErrorHandlerStack($this);
 		$this->_handlers[self::LL_CRITICAL] = new kExceptionHandlerStack($this);
 	}
 
 	/**
 	 * Disables error/exception handling capabilities
 	 *
 	 * @return void
 	 * @access protected
 	 */
 	protected function _disableErrorHandling()
 	{
 		foreach ($this->_handlers as $index => $handler) {
 			$this->_handlers[$index]->__destruct();
 			unset($this->_handlers[$index]);
 		}
 	}
 
 	/**
 	 * Initializes new log record. Use "kLogger::write" to save to db/disk
 	 *
 	 * @param string $message
 	 * @param int $code
 	 * @return kLogger
 	 * @access public
 	 */
 	public function prepare($message = '', $code = null)
 	{
 		$this->_logRecord = Array (
 			'LogUniqueId' => kUtil::generateId(),
 			'LogMessage' => $message,
 			'LogLevel' => self::LL_INFO,
 			'LogCode' => $code,
 			'LogType' => self::LT_OTHER,
 			'LogHostname' => $_SERVER['HTTP_HOST'],
 			'LogRequestSource' => php_sapi_name() == 'cli' ? 2 : 1,
 			'LogRequestURI' => php_sapi_name() == 'cli' ? implode(' ', $GLOBALS['argv']) : $_SERVER['REQUEST_URI'],
 			'LogUserId' => USER_GUEST,
 			'IpAddress' => isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : '',
 			'LogSessionKey' => 0,
 			'LogProcessId' => getmypid(),
 			'LogUserData' => '',
 			'LogNotificationStatus' => self::LNS_DISABLED,
 		);
 
 		if ( $this->Application->isAdmin ) {
 			$this->_logRecord['LogInterface'] = defined('CRON') && CRON ? self::LI_CRON_ADMIN : self::LI_ADMIN;
 		}
 		else {
 			$this->_logRecord['LogInterface'] = defined('CRON') && CRON ? self::LI_CRON_FRONT : self::LI_FRONT;
 		}
 
 		if ( $this->Application->InitDone ) {
 			$this->_logRecord['LogUserId'] = $this->Application->RecallVar('user_id');
 			$this->_logRecord['LogSessionKey'] = $this->Application->GetSID();
 			$this->_logRecord['IpAddress'] = $this->Application->getClientIp();
 		}
 
 		return $this;
 	}
 
 	/**
 	 * Sets one or more fields of log record
 	 *
 	 * @param string|Array $field_name
 	 * @param string|null $field_value
 	 * @return kLogger
 	 * @access public
 	 * @throws UnexpectedValueException
 	 */
 	public function setLogField($field_name, $field_value = null)
 	{
 		if ( isset($field_value) ) {
 			$this->_logRecord[$field_name] = $field_value;
 		}
 		elseif ( is_array($field_name) ) {
 			$this->_logRecord = array_merge($this->_logRecord, $field_name);
 		}
 		else {
 			throw new UnexpectedValueException('Invalid arguments');
 		}
 
 		return $this;
 	}
 
 	/**
 	 * Sets user data
 	 *
 	 * @param string $data
 	 * @param bool $as_array
 	 * @return kLogger
 	 * @access public
 	 */
 	public function setUserData($data, $as_array = false)
 	{
 		if ( $as_array ) {
 			$data = serialize((array)$data);
 		}
 
 		return $this->setLogField('LogUserData', $data);
 	}
 
 	/**
 	 * Add user data
 	 *
 	 * @param string $data
 	 * @param bool $as_array
 	 * @return kLogger
 	 * @access public
 	 */
 	public function addUserData($data, $as_array = false)
 	{
 		$new_data = $this->_logRecord['LogUserData'];
 
 		if ( $as_array ) {
 			$new_data = $new_data ? unserialize($new_data) : Array ();
 			$new_data[] = $data;
 			$new_data = serialize($new_data);
 		}
 		else {
 			$new_data .= ($new_data ? PHP_EOL : '') . $data;
 		}
 
 		return $this->setLogField('LogUserData', $new_data);
 	}
 
 	/**
 	 * Adds event to log record
 	 *
 	 * @param kEvent $event
 	 * @return kLogger
 	 * @access public
 	 */
 	public function addEvent(kEvent $event)
 	{
 		$this->_logRecord['LogEventName'] = (string)$event;
 
 		return $this;
 	}
 
 	/**
 	 * Adds log source file & file to log record
 	 *
 	 * @param string|Array $file_or_trace file path
 	 * @param int $line file line
 	 * @return kLogger
 	 * @access public
 	 */
 	public function addSource($file_or_trace = '', $line = 0)
 	{
 		if ( is_array($file_or_trace) ) {
 			$trace_info = $file_or_trace[0];
 			$this->_logRecord['LogSourceFilename'] = $trace_info['file'];
 			$this->_logRecord['LogSourceFileLine'] = $trace_info['line'];
 		}
 		else {
 			$this->_logRecord['LogSourceFilename'] = $file_or_trace;
 			$this->_logRecord['LogSourceFileLine'] = $line;
 		}
 
 		return $this;
 	}
 
 	/**
 	 * Adds session contents to log record
 	 *
 	 * @param bool $include_optional Include optional session variables
 	 * @return kLogger
 	 * @access public
 	 */
 	public function addSessionData($include_optional = false)
 	{
 		if ( $this->Application->InitDone ) {
 			$this->_logRecord['LogSessionData'] = serialize($this->Application->Session->getSessionData($include_optional));
 		}
 
 		return $this;
 	}
 
 	/**
 	 * Adds user request information to log record
 	 *
 	 * @return kLogger
 	 * @access public
 	 */
 	public function addRequestData()
 	{
 		$request_data = array(
 			'Headers' => $this->Application->HttpQuery->getHeaders(),
 		);
 
 		$request_variables = Array('_GET' => $_GET, '_POST' => $_POST, '_COOKIE' => $_COOKIE);
 
 		foreach ( $request_variables as $title => $data ) {
 			if ( !$data ) {
 				continue;
 			}
 
 			$request_data[$title] = $data;
 		}
 
 		$this->_logRecord['LogRequestData'] = serialize($request_data);
 
 		return $this;
 	}
 
 	/**
 	 * Adds trace to log record
 	 *
 	 * @param Array $trace
 	 * @param int $skip_levels
 	 * @param Array $skip_files
 	 * @return kLogger
 	 * @access public
 	 */
 	public function addTrace($trace = null, $skip_levels = 1, $skip_files = null)
 	{
 		$trace = $this->createTrace($trace, $skip_levels, $skip_files);
 
 		foreach ($trace as $trace_index => $trace_info) {
 			if ( isset($trace_info['args']) ) {
 				$trace[$trace_index]['args'] = $this->_implodeObjects($trace_info['args']);
 			}
 		}
 
 		$this->_logRecord['LogBacktrace'] = serialize($this->_removeObjectsFromTrace($trace));
 
 		return $this;
 	}
 
 	/**
 	 * Remove objects from trace, since before PHP 5.2.5 there wasn't possible to remove them initially
 	 *
 	 * @param Array $trace
 	 * @return Array
 	 * @access protected
 	 */
 	protected function _removeObjectsFromTrace($trace)
 	{
 		if ( version_compare(PHP_VERSION, '5.3', '>=') ) {
 			return $trace;
 		}
 
 		$trace_indexes = array_keys($trace);
 
 		foreach ($trace_indexes as $trace_index) {
 			unset($trace[$trace_index]['object']);
 		}
 
 		return $trace;
 	}
 
 	/**
 	 * Implodes object to prevent memory leaks
 	 *
 	 * @param Array $array
 	 * @return Array
 	 * @access protected
 	 */
 	protected function _implodeObjects($array)
 	{
 		$ret = Array ();
 
 		foreach ($array as $key => $value) {
 			if ( is_array($value) ) {
 				$ret[$key] = $this->_implodeObjects($value);
 			}
 			elseif ( is_object($value) ) {
 				if ( $value instanceof kEvent ) {
 					$ret[$key] = 'Event: ' . (string)$value;
 				}
 				elseif ( $value instanceof kBase ) {
 					$ret[$key] = (string)$value;
 				}
 				else {
 					$ret[$key] = 'Class: ' . get_class($value);
 				}
 			}
 			elseif ( strlen($value) > 200 ) {
 				$ret[$key] = substr($value, 0, 50) . ' ...';
 			}
 			else {
 				$ret[$key] = $value;
 			}
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Removes first N levels from trace
 	 *
 	 * @param Array $trace
 	 * @param int $levels
 	 * @param Array $files
 	 * @return Array
 	 * @access public
 	 */
 	public function createTrace($trace = null, $levels = null, $files = null)
 	{
 		if ( !isset($trace) ) {
 			$trace = debug_backtrace(false);
 		}
 
 		if ( !$trace ) {
 			// no trace information
 			return $trace;
 		}
 
 		if ( isset($levels) && is_numeric($levels) ) {
 			for ($i = 0; $i < $levels; $i++) {
 				array_shift($trace);
 			}
 		}
 
 		if ( isset($files) && is_array($files) ) {
 			$classes = array_keys($files);
 
 			while ( true ) {
 				$trace_info = $trace[0];
 				$file = isset($trace_info['file']) ? basename($trace_info['file']) : '';
 				$class = isset($trace_info['class']) ? $trace_info['class'] : '';
 
 				if ( ($file && !in_array($file, $files)) || ($class && !in_array($class, $classes)) ) {
 					break;
 				}
 
 				array_shift($trace);
 			}
 		}
 
 		return $trace;
 	}
 
 	/**
 	 * Adds PHP error to log record
 	 *
 	 * @param int $errno
 	 * @param string $errstr
 	 * @param string $errfile
 	 * @param int $errline
 	 * @return kLogger
 	 * @access public
 	 */
 	public function addError($errno, $errstr, $errfile = null, $errline = null)
 	{
 		$errstr = self::expandMessage($errstr, !$this->_debugMode);
 		$this->_logRecord['LogLevel'] = $this->_getLogLevelByErrorNo($errno);
 
 		if ( $this->isLogType(self::LT_DATABASE, $errstr) ) {
 			list ($errno, $errstr, $sql) = self::parseDatabaseError($errstr);
 
 			$this->_logRecord['LogType'] = self::LT_DATABASE;
 			$this->_logRecord['LogUserData'] = $sql;
 
 			$trace = $this->createTrace(null, 4, $this->_ignoreInTrace);
 			$this->addSource($trace);
 			$this->addTrace($trace, 0);
 		}
 		else {
 			$this->_logRecord['LogType'] = self::LT_PHP;
 
 			$this->addSource((string)$errfile, $errline);
 			$this->addTrace(null, 4);
 		}
 
 		$this->_logRecord['LogCode'] = $errno;
 		$this->_logRecord['LogMessage'] = $errstr;
 
 		return $this;
 	}
 
 	/**
 	 * Adds PHP exception to log record
 	 *
 	 * @param Exception $exception
 	 * @return kLogger
 	 * @access public
 	 */
 	public function addException($exception)
 	{
 		$errstr = self::expandMessage($exception->getMessage(), !$this->_debugMode);
 		$this->_logRecord['LogLevel'] = self::LL_CRITICAL;
 
 		$exception_trace = $exception->getTrace();
 
 		array_unshift($exception_trace, array(
 			'function' => '',
 			'file' => $exception->getFile() !== null ? $exception->getFile() : 'n/a',
 			'line' => $exception->getLine() !== null ? $exception->getLine() : 'n/a',
 			'args' => array(),
 		));
 
 		if ( $this->isLogType(self::LT_DATABASE, $errstr) ) {
 			list ($errno, $errstr, $sql) = self::parseDatabaseError($errstr);
 
 			$this->_logRecord['LogType'] = self::LT_DATABASE;
 			$this->_logRecord['LogUserData'] = $sql;
 
 			$trace = $this->createTrace($exception_trace, null, $this->_ignoreInTrace);
 			$this->addSource($trace);
 			$this->addTrace($trace, 0);
 		}
 		else {
 			$this->_logRecord['LogType'] = self::LT_PHP;
 			$errno = $exception->getCode();
 
 			$this->addSource((string)$exception->getFile(), $exception->getLine());
 			$this->addTrace($exception_trace, 0);
 		}
 
 		$this->_logRecord['LogCode'] = $errno;
 		$this->_logRecord['LogMessage'] = $errstr;
 
 		return $this;
 	}
 
 	/**
 	 * Allows to map PHP error numbers to syslog log level
 	 *
 	 * @param int $errno
 	 * @return int
 	 * @access protected
 	 */
 	protected function _getLogLevelByErrorNo($errno)
 	{
 		$error_number_mapping = Array (
 			self::LL_ERROR 		=>	Array (E_RECOVERABLE_ERROR, E_USER_ERROR, E_ERROR, E_CORE_ERROR, E_COMPILE_ERROR, E_PARSE),
 			self::LL_WARNING	=>	Array (E_WARNING, E_USER_WARNING, E_CORE_WARNING, E_COMPILE_WARNING),
 			self::LL_NOTICE		=>	Array (E_NOTICE, E_USER_NOTICE, E_STRICT),
 		);
 
 		if ( version_compare(PHP_VERSION, '5.3.0', '>=') ) {
 			$error_number_mapping[self::LL_NOTICE][] = E_DEPRECATED;
 			$error_number_mapping[self::LL_NOTICE][] = E_USER_DEPRECATED;
 		}
 
 		foreach ($error_number_mapping as $log_level => $error_numbers) {
 			if ( in_array($errno, $error_numbers) ) {
 				return $log_level;
 			}
 		}
 
 		return self::LL_ERROR;
 	}
 
 	/**
 	 * Changes log level of a log record
 	 *
 	 * @param int $log_level
 	 * @return kLogger
 	 * @access public
 	 */
 	public function setLogLevel($log_level)
 	{
 		$this->_logRecord['LogLevel'] = $log_level;
 
 		return $this;
 	}
 
 	/**
 	 * Writes prepared log to database or disk, when database isn't available
 	 *
 	 * @param int $storage_medium
 	 * @return bool|int
 	 * @access public
 	 * @throws InvalidArgumentException
 	 */
 	public function write($storage_medium = self::LS_AUTOMATIC)
 	{
 		if ( !$this->_logRecord || $this->_logRecord['LogLevel'] > $this->_maxLogLevel || $this->_state == self::STATE_DISABLED ) {
 			// nothing to save OR less detailed logging requested OR disabled
 			return false;
 		}
 
 		$this->_logRecord['LogMemoryUsed'] = memory_get_usage();
 		$this->_logRecord['LogTimestamp'] = time();
 		$this->_logRecord['LogDate'] = date('Y-m-d H:i:s');
 
 		if ( $storage_medium == self::LS_AUTOMATIC ) {
 			$storage_medium = $this->Conn->connectionOpened() ? self::LS_DATABASE : self::LS_DISK;
 		}
 
 		if ( $storage_medium == self::LS_DATABASE ) {
 			$result = $this->Conn->doInsert($this->_logRecord, TABLE_PREFIX . 'SystemLog');
 		}
 		elseif ( $storage_medium == self::LS_DISK ) {
 			$result = $this->_saveToFile(RESTRICTED . '/system.log');
 		}
 		else {
 			throw new InvalidArgumentException('Unknown storage medium "' . $storage_medium . '"');
 		}
 
 		$unique_id = $this->_logRecord['LogUniqueId'];
 
 		if ( $this->_logRecord['LogNotificationStatus'] == self::LNS_SENT ) {
 			$this->_sendNotification($unique_id);
 		}
 
 		$this->_logRecord = Array ();
 
 		return $result ? $unique_id : false;
 	}
 
 	/**
 	 * Catches last error happened before script ended
 	 *
 	 * @return void
 	 * @access public
 	 */
 	public function catchLastError()
 	{
 		$this->write();
 		$last_error = error_get_last();
 
 		if ( !is_null($last_error) && isset($this->_handlers[self::LL_ERROR]) ) {
+			/** @var kErrorHandlerStack $handler */
 			$handler = $this->_handlers[self::LL_ERROR];
-			/* @var $handler kErrorHandlerStack */
 
 			$handler->handle($last_error['type'], $last_error['message'], $last_error['file'], $last_error['line']);
 		}
 	}
 
 	/**
 	 * Deletes log with given id from database or disk, when database isn't available
 	 *
 	 * @param int $unique_id
 	 * @param int $storage_medium
 	 * @return void
 	 * @access public
 	 * @throws InvalidArgumentException
 	 */
 	public function delete($unique_id, $storage_medium = self::LS_AUTOMATIC)
 	{
 		if ( $storage_medium == self::LS_AUTOMATIC ) {
 			$storage_medium = $this->Conn->connectionOpened() ? self::LS_DATABASE : self::LS_DISK;
 		}
 
 		if ( $storage_medium == self::LS_DATABASE ) {
 			$sql = 'DELETE FROM ' . TABLE_PREFIX . 'SystemLog
 					WHERE LogUniqueId = ' . $unique_id;
 			$this->Conn->Query($sql);
 		}
 		elseif ( $storage_medium == self::LS_DISK ) {
 			// TODO: no way to delete a line from a file
 		}
 		else {
 			throw new InvalidArgumentException('Unknown storage medium "' . $storage_medium . '"');
 		}
 	}
 
 	/**
 	 * Send notification (delayed or instant) about log record to e-mail from configuration
 	 *
 	 * @param bool $instant
 	 * @return kLogger
 	 * @access public
 	 */
 	public function notify($instant = false)
 	{
 		$this->_logRecord['LogNotificationStatus'] = $instant ? self::LNS_SENT : self::LNS_PENDING;
 
 		return $this;
 	}
 
 	/**
 	 * Sends notification e-mail about message with given $unique_id
 	 *
 	 * @param int $unique_id
 	 * @return void
 	 * @access protected
 	 */
 	protected function _sendNotification($unique_id)
 	{
 		$notification_email = $this->Application->ConfigValue('SystemLogNotificationEmail');
 
 		if ( !$notification_email ) {
 			trigger_error('System Log notification E-mail not specified', E_USER_NOTICE);
 
 			return;
 		}
 
 		$send_params = Array (
 			'to_name' => $notification_email,
 			'to_email' => $notification_email,
 		);
 
 		// initialize list outside of e-mail event with right settings
 		$this->Application->recallObject('system-log.email', 'system-log_List', Array ('unique_id' => $unique_id));
 
 		$this->Application->emailAdmin('SYSTEM.LOG.NOTIFY', null, $send_params);
 		$this->Application->removeObject('system-log.email');
 	}
 
 	/**
 	 * Adds error/exception handler
 	 *
 	 * @param string|Array $handler
 	 * @param bool $is_exception
 	 * @return void
 	 * @access public
 	 */
 	public function addErrorHandler($handler, $is_exception = false)
 	{
 		$this->_handlers[$is_exception ? self::LL_CRITICAL : self::LL_ERROR]->add($handler);
 	}
 
 	/**
 	 * SQL Error Handler
 	 *
 	 * When not debug mode, then fatal database query won't break anything.
 	 *
 	 * @param int $code
 	 * @param string $msg
 	 * @param string $sql
 	 * @return bool
 	 * @access public
 	 * @throws RuntimeException
 	 */
 	public function handleSQLError($code, $msg, $sql)
 	{
 		$error_msg = self::shortenMessage(self::DB_ERROR_PREFIX . ' #' . $code . ' - ' . $msg . '. SQL: ' . trim($sql));
 
 		if ( isset($this->Application->Debugger) ) {
 			if ( kUtil::constOn('DBG_SQL_FAILURE') && !defined('IS_INSTALL') ) {
 				throw new RuntimeException($error_msg);
 			}
 			else {
 				$this->Application->Debugger->appendTrace();
 			}
 		}
 
 		// next line also trigger attached error handlers
 		trigger_error($error_msg, E_USER_WARNING);
 
 		return true;
 	}
 
 	/**
 	 * Packs information about error into a single line
 	 *
 	 * @param string $errno
 	 * @param bool $strip_tags
 	 * @return string
 	 * @access public
 	 */
 	public function toString($errno = null, $strip_tags = false)
 	{
 		if ( !isset($errno) ) {
 			$errno = $this->_logRecord['LogCode'];
 		}
 
 		$errstr = $this->_logRecord['LogMessage'];
 		$errfile = $this->_logRecord['LogSourceFilename'];
 		$errline = $this->_logRecord['LogSourceFileLine'];
 
 		if ( PHP_SAPI === 'cli' ) {
 			$result = sprintf('  [%s]  ' . PHP_EOL . '  %s', $errno, $errstr);
 
 			if ( $this->_logRecord['LogBacktrace'] ) {
 				$result .= $this->printBacktrace(unserialize($this->_logRecord['LogBacktrace']));
 			}
 		}
 		else {
 			$result = '<strong>' . $errno . ': </strong>' . "{$errstr} in {$errfile} on line {$errline}";
 		}
 
 		return $strip_tags ? strip_tags($result) : $result;
 	}
 
 	/**
 	 * Prints backtrace result
 	 *
 	 * @param array $trace Trace.
 	 *
 	 * @return string
 	 */
 	protected function printBacktrace(array $trace)
 	{
 		if ( !$trace ) {
 			return '';
 		}
 
 		$ret = PHP_EOL . PHP_EOL . PHP_EOL . 'Exception trace:' . PHP_EOL;
 
 		foreach ( $trace as $trace_info ) {
 			$class = isset($trace_info['class']) ? $trace_info['class'] : '';
 			$type = isset($trace_info['type']) ? $trace_info['type'] : '';
 			$function = $trace_info['function'];
 			$args = isset($trace_info['args']) && $trace_info['args'] ? '...' : '';
 			$file = isset($trace_info['file']) ? $trace_info['file'] : 'n/a';
 			$line = isset($trace_info['line']) ? $trace_info['line'] : 'n/a';
 
 			$ret .= sprintf(' %s%s%s(%s) at %s:%s' . PHP_EOL, $class, $type, $function, $args, $file, $line);
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Saves log to file (e.g. when not possible to save into database)
 	 *
 	 * @param $filename
 	 * @return bool
 	 * @access protected
 	 */
 	protected function _saveToFile($filename)
 	{
 		$time = date('Y-m-d H:i:s');
 		$log_file = new SplFileObject($filename, 'a');
 
 		return $log_file->fwrite('[' . $time . '] #' . $this->toString(null, true) . PHP_EOL) > 0;
 	}
 
 	/**
 	 * Checks if log type of current log record matches given one
 	 *
 	 * @param int $log_type
 	 * @param string $log_message
 	 * @return bool
 	 * @access public
 	 */
 	public function isLogType($log_type, $log_message = null)
 	{
 		if ( $this->_logRecord['LogType'] == $log_type ) {
 			return true;
 		}
 
 		if ( $log_type == self::LT_DATABASE ) {
 			if ( !isset($log_message) ) {
 				$log_message = $this->_logRecord['LogMessage'];
 			}
 
 			return strpos($log_message, self::DB_ERROR_PREFIX) !== false;
 		}
 
 		return false;
 	}
 
 	/**
 	 * Shortens message
 	 *
 	 * @param string $message
 	 * @return string
 	 * @access public
 	 */
 	public static function shortenMessage($message)
 	{
 		$max_len = ini_get('log_errors_max_len');
 
 		if ( strlen($message) > $max_len ) {
 			$long_key = kUtil::generateId();
 			self::$_longMessages[$long_key] = $message;
 
 			return mb_substr($message, 0, $max_len - strlen($long_key) - 2) . ' #' . $long_key;
 		}
 
 		return $message;
 	}
 
 	/**
 	 * Expands shortened message
 	 *
 	 * @param string $message
 	 * @param bool $clear_cache Allow debugger to expand message after it's been expanded by kLogger
 	 * @return string
 	 * @access public
 	 */
 	public static function expandMessage($message, $clear_cache = true)
 	{
 		if ( preg_match('/(.*)#([\d]+)$/', $message, $regs) ) {
 			$long_key = $regs[2];
 
 			if ( isset(self::$_longMessages[$long_key]) ) {
 				$message = self::$_longMessages[$long_key];
 
 				if ( $clear_cache ) {
 					unset(self::$_longMessages[$long_key]);
 				}
 			}
 		}
 
 		return $message;
 	}
 
 	/**
 	 * Parses database error message into error number, error message and sql that caused that error
 	 *
 	 * @static
 	 * @param string $message
 	 * @return Array
 	 * @access public
 	 */
 	public static function parseDatabaseError($message)
 	{
 		$regexp = '/' . preg_quote(self::DB_ERROR_PREFIX) . ' #(.*?) - (.*?)\. SQL: (.*?)$/s';
 
 		if ( preg_match($regexp, $message, $regs) ) {
 			// errno, errstr, sql
 			return Array ($regs[1], $regs[2], $regs[3]);
 		}
 
 		return Array (0, $message, '');
 	}
 }
 
 
 /**
  * Base class for error or exception handling
  */
 abstract class kHandlerStack extends kBase {
 
 	/**
 	 * List of added handlers
 	 *
 	 * @var Array
 	 * @access protected
 	 */
 	protected $_handlers = Array ();
 
 	/**
 	 * Reference to event log, which created this object
 	 *
 	 * @var kLogger
 	 * @access protected
 	 */
 	protected $_logger;
 
 	/**
 	 * Remembers if handler is activated
 	 *
 	 * @var bool
 	 * @access protected
 	 */
 	protected $_enabled = false;
 
 	public function __construct(kLogger $logger)
 	{
 		parent::__construct();
 
 		$this->_logger = $logger;
 
 		if ( !kUtil::constOn('DBG_ZEND_PRESENT') ) {
 			$this->attach();
 			$this->_enabled = true;
 		}
 	}
 
 	/**
 	 * Detaches from error handling routines on class destruction
 	 *
 	 * @return void
 	 * @access public
 	 */
 	public function __destruct()
 	{
 		if ( !$this->_enabled ) {
 			return;
 		}
 
 		$this->detach();
 		$this->_enabled = false;
 	}
 
 	/**
 	 * Attach to error handling routines
 	 *
 	 * @abstract
 	 * @return void
 	 * @access protected
 	 */
 	abstract protected function attach();
 
 	/**
 	 * Detach from error handling routines
 	 *
 	 * @abstract
 	 * @return void
 	 * @access protected
 	 */
 	abstract protected function detach();
 
 	/**
 	 * Adds new handler to the stack
 	 *
 	 * @param callable $handler
 	 * @return void
 	 * @access public
 	 */
 	public function add($handler)
 	{
 		$this->_handlers[] = $handler;
 	}
 
 	protected function _handleFatalError($errno)
 	{
 		$debug_mode = defined('DEBUG_MODE') && DEBUG_MODE;
 		$skip_reporting = defined('DBG_SKIP_REPORTING') && DBG_SKIP_REPORTING;
 
 		if ( !$this->_handlers || ($debug_mode && $skip_reporting) ) {
 			// when debugger absent OR it's present, but we actually can't see it's error report (e.g. during ajax request)
 
 			if ( $this->_isFatalError($errno) ) {
 				$this->_displayFatalError($errno);
 			}
 
 			if ( !$this->_handlers ) {
 				return true;
 			}
 		}
 
 		return null;
 	}
 
 	/**
 	 * Determines if given error is a fatal
 	 *
 	 * @abstract
 	 * @param Exception|int $errno
 	 * @return bool
 	 */
 	abstract protected function _isFatalError($errno);
 
 	/**
 	 * Displays div with given error message
 	 *
 	 * @param string $errno
 	 * @return void
 	 * @access protected
 	 */
 	protected function _displayFatalError($errno)
 	{
 		$errno = $this->_getFatalErrorTitle($errno);
 
 		$margin = $this->Application->isAdmin ? '8px' : 'auto';
 		$error_msg = $this->_logger->toString($errno, PHP_SAPI === 'cli');
 
 		if ( PHP_SAPI === 'cli' ) {
 			echo $error_msg;
 		}
 		else {
 			echo '<div style="background-color: #FEFFBF; margin: ' . $margin . '; padding: 10px; border: 2px solid red; text-align: center">' . $error_msg . '</div>';
 		}
 
 		exit;
 	}
 
 	/**
 	 * Returns title to show for a fatal
 	 *
 	 * @abstract
 	 * @param Exception|int $errno
 	 * @return string
 	 */
 	abstract protected function _getFatalErrorTitle($errno);
 }
 
 
 /**
  * Class, that handles errors
  */
 class kErrorHandlerStack extends kHandlerStack {
 
 	/**
 	 * Attach to error handling routines
 	 *
 	 * @return void
 	 * @access protected
 	 */
 	protected function attach()
 	{
 		// set as error handler
 		$error_handler = set_error_handler(Array ($this, 'handle'));
 
 		if ( $error_handler ) {
 			// wrap around previous error handler, if any was set
 			$this->_handlers[] = $error_handler;
 		}
 	}
 
 	/**
 	 * Detach from error handling routines
 	 *
 	 * @return void
 	 * @access protected
 	 */
 	protected function detach()
 	{
 		restore_error_handler();
 	}
 
 	/**
 	 * Determines if given error is a fatal
 	 *
 	 * @param int $errno
 	 * @return bool
 	 * @access protected
 	 */
 	protected function _isFatalError($errno)
 	{
 		$fatal_errors = Array (E_USER_ERROR, E_RECOVERABLE_ERROR, E_ERROR, E_CORE_ERROR, E_COMPILE_ERROR, E_PARSE);
 
 		return in_array($errno, $fatal_errors);
 	}
 
 	/**
 	 * Returns title to show for a fatal
 	 *
 	 * @param int $errno
 	 * @return string
 	 * @access protected
 	 */
 	protected function _getFatalErrorTitle($errno)
 	{
 		return 'Fatal Error';
 	}
 
 	/**
 	 * Default error handler
 	 *
 	 * @param int $errno
 	 * @param string $errstr
 	 * @param string $errfile
 	 * @param int $errline
 	 * @param Array $errcontext
 	 * @return bool
 	 * @access public
 	 */
 	public function handle($errno, $errstr, $errfile = null, $errline = null, $errcontext = Array ())
 	{
 		$log = $this->_logger->prepare()->addError($errno, $errstr, $errfile, $errline);
 
 		if ( $this->_handleFatalError($errno) ) {
 			$log->write();
 
 			return true;
 		}
 
 		$log->write();
 
 		$res = false;
 
 		foreach ($this->_handlers as $handler) {
 			$res = call_user_func($handler, $errno, $errstr, $errfile, $errline, $errcontext);
 		}
 
 		return $res;
 	}
 }
 
 
 /**
  * Class, that handles exceptions
  */
 class kExceptionHandlerStack extends kHandlerStack {
 
 	/**
 	 * Attach to error handling routines
 	 *
 	 * @return void
 	 * @access protected
 	 */
 	protected function attach()
 	{
 		// set as exception handler
 		$exception_handler = set_exception_handler(Array ($this, 'handle'));
 
 		if ( $exception_handler ) {
 			// wrap around previous exception handler, if any was set
 			$this->_handlers[] = $exception_handler;
 		}
 	}
 
 	/**
 	 * Detach from error handling routines
 	 *
 	 * @return void
 	 * @access protected
 	 */
 	protected function detach()
 	{
 		restore_exception_handler();
 	}
 
 	/**
 	 * Determines if given error is a fatal
 	 *
 	 * @param Exception $errno
 	 * @return bool
 	 */
 	protected function _isFatalError($errno)
 	{
 		return true;
 	}
 
 	/**
 	 * Returns title to show for a fatal
 	 *
 	 * @param Exception $errno
 	 * @return string
 	 */
 	protected function _getFatalErrorTitle($errno)
 	{
 		return get_class($errno);
 	}
 
 	/**
 	 * Handles exception
 	 *
 	 * @param Exception $exception
 	 * @return bool
 	 * @access public
 	 */
 	public function handle($exception)
 	{
 		$log = $this->_logger->prepare()->addException($exception);
 
 		if ( $exception instanceof kRedirectException ) {
-			/* @var $exception kRedirectException */
+			/** @var kRedirectException $exception */
 
 			$exception->run();
 		}
 
 		if ( $this->_handleFatalError($exception) ) {
 			$log->write();
 
 			return true;
 		}
 
 		$log->write();
 
 		$res = false;
 
 		foreach ($this->_handlers as $handler) {
 			$res = call_user_func($handler, $exception);
 		}
 
 		return $res;
 	}
 }
Index: branches/5.3.x/core/kernel/utility/event.php
===================================================================
--- branches/5.3.x/core/kernel/utility/event.php	(revision 16518)
+++ branches/5.3.x/core/kernel/utility/event.php	(revision 16519)
@@ -1,458 +1,458 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 final class kEvent extends kBase
 {
 
 	/**
 	 * Event finished working successfully.
 	 */
 	const erSUCCESS = 0;
 
 	/**
 	 * Event finished working, but result is unsuccessful.
 	 */
 	const erFAIL = -1;
 
 	/**
 	 * Event experienced FATAL error - no hooks should continue!
 	 */
 	const erFATAL = -2;
 
 	/**
 	 * Event failed on internal permission checking (user has no permission).
 	 */
 	const erPERM_FAIL = -3;
 
 	/**
 	 * Event requested to stop processing (don't parse templates).
 	 */
 	const erSTOP = -4;
 
 	/**
 	 * Flag, set as event parameter, that indicates that ID is coming from Web Request.
 	 */
 	const FLAG_ID_FROM_REQUEST = 'id_from_request';
 
 	/**
 	 * Reference to event, that created given event.
 	 *
 	 * @var self
 	 */
 	public $MasterEvent;
 
 	/**
 	 * Event name.
 	 *
 	 * @var string
 	 */
 	public $Name;
 
 	/**
 	 * Don't execute hooks, before event processing.
 	 *
 	 * @var boolean
 	 */
 	public $SkipBeforeHooks = false;
 
 	/**
 	 * Don't execute hooks, after event processing.
 	 *
 	 * @var boolean
 	 */
 	public $SkipAfterHooks = false;
 
 	/**
 	 * Perform redirect after event processing.
 	 *
 	 * Redirect after event processing allows to prevent same event being
 	 * present in resulting url. Also could contain template name, that
 	 * needs to be shown after redirect.
 	 *
 	 * @var mixed
 	 */
 	public $redirect = true;
 
 	/**
 	 * Params, used during redirect url building after event successful processing.
 	 *
 	 * @var array
 	 */
 	private $_redirectParams = array();
 
 	/**
 	 * PHP file to redirect to. Defaults to "index.php".
 	 *
 	 * @var string
 	 */
 	public $redirectScript = null;
 
 	/**
 	 * Event processing status.
 	 *
 	 * @var integer
 	 */
 	public $status = self::erSUCCESS;
 
 	/**
 	 * Event parameters.
 	 *
 	 * Usually indicate, how particular event should be processed.
 	 *
 	 * @var array
 	 */
 	private $_specificParams = array();
 
 	/**
 	 * Pseudo class used, to create object, based on event contents.
 	 *
 	 * @var string
 	 */
 	private $_pseudoClass = '';
 
 	/**
 	 * Creates an event from array.
 	 *
 	 * @param array $params          Event string in array format with 'prefix', 'special' (optional) and 'name' keys.
 	 * @param array $specific_params Specific params.
 	 *
 	 * @return self
 	 */
 	public static function fromArray(array $params, array $specific_params = array())
 	{
 		$prefix = isset($params['prefix']) ? $params['prefix'] : false;
 		$special = isset($params['special']) ? $params['special'] : false;
 		$name = isset($params['name']) ? $params['name'] : '';
 
 		return new self($prefix . '.' . $special . ':' . $name, $specific_params);
 	}
 
 	/**
 	 * Create event from given prefix, special, name and specific params.
 	 * Parameter $params could be be an an array with following  keys: "prefix", "special" (optional), "name".
 	 * Parameter $params could be a string in format: "prefix:name" or "prefix.special:name".
 	 *
 	 * @param mixed $event_string    Params.
 	 * @param array $specific_params Event specific params (none by default).
 	 *
 	 * @throws InvalidArgumentException When incorrect event string given.
 	 */
 	public function __construct($event_string, array $specific_params = array())
 	{
 		parent::__construct();
 
 		if ( preg_match('/([^.:]*)[.]{0,1}([^:]*):(.*)/', $event_string, $regs) ) {
 			$prefix = $regs[1];
 			$special = $regs[2];
 
 			if ( $prefix ) {
 				$this->Init($prefix, $special);
 			}
 
 			$this->Name = $regs[3];
 			$this->_specificParams = $specific_params;
 		}
 		else {
 			$error_msg = 'Invalid event string: "<strong>' . $event_string . '</strong>". ';
 			$error_msg .= 'Should be in "prefix[.special]:OnEvent" format';
 			throw new InvalidArgumentException($error_msg);
 		}
 	}
 
 	/**
 	 * Returns joined prefix and special if any.
 	 *
 	 * @param boolean $from_submit If true, then joins prefix & special by "_", uses  "." otherwise.
 	 *
 	 * @return string
 	 */
 	public function getPrefixSpecial($from_submit = false)
 	{
 		if ( !$from_submit ) {
 			return parent::getPrefixSpecial();
 		}
 
 		return rtrim($this->Prefix . '_' . $this->Special, '_');
 	}
 
 	/**
 	 * Sets event parameter.
 	 *
 	 * @param string $name  Name.
 	 * @param mixed  $value Value.
 	 *
 	 * @return void
 	 */
 	public function setEventParam($name, $value)
 	{
 		$this->_specificParams[$name] = $value;
 	}
 
 	/**
 	 * Returns event parameter by name (supports digging).
 	 *
 	 * @param string $name Name.
 	 *
 	 * @return mixed
 	 */
 	public function getEventParam($name)
 	{
 		$args = func_get_args();
 
 		if ( count($args) > 1 ) {
 			kUtil::array_unshift_ref($args, $this->_specificParams);
 
 			return call_user_func_array('getArrayValue', $args);
 		}
 
 		return array_key_exists($name, $this->_specificParams) ? $this->_specificParams[$name] : false;
 	}
 
 	/**
 	 * Returns all event parameters.
 	 *
 	 * @return array
 	 */
 	public function getEventParams()
 	{
 		return $this->_specificParams;
 	}
 
 	/**
 	 * Set's pseudo class that differs from the one specified in $Prefix.
 	 *
 	 * @param string $appendix Appendix.
 	 *
 	 * @return void
 	 */
 	public function setPseudoClass($appendix)
 	{
 		$this->_pseudoClass = $this->Prefix . $appendix;
 	}
 
 	/**
 	 * Performs event initialization.
 	 *
 	 * Also sets pseudo class same $prefix.
 	 *
 	 * @param string $prefix  Prefix.
 	 * @param string $special Special.
 	 *
 	 * @return void
 	 */
 	public function Init($prefix, $special)
 	{
 		$this->_pseudoClass = $prefix;
 
 		parent::Init($prefix, $special);
 	}
 
 	/**
 	 * Returns object used in event.
 	 *
 	 * @param array $params Params.
 	 *
 	 * @return kDBBase
 	 */
 	public function getObject(array $params = array())
 	{
 		if ( !$this->Application->hasObject($this->prefixSpecial) ) {
 			$top_event = $this;
 
 			// When OnSave calls OnPreSave in first line, then this would make sure OnSave is used.
 			while ( is_object($top_event->MasterEvent) ) {
 				$top_event = $top_event->MasterEvent;
 			}
 
 			$params['parent_event'] = $top_event;
 		}
 
 		return $this->Application->recallObject($this->prefixSpecial, $this->_pseudoClass, $params);
 	}
 
 	/**
 	 * Executes given event in context of current event.
 	 *
 	 * Sub-event gets this event in "kEvent::MasterEvent" attribute.
 	 * Sub-event execution results (status and redirect* properties) are copied back to current event.
 	 *
 	 * @param string $name Name of callable event (optionally could contain prefix_special as well).
 	 *
 	 * @return void
 	 * @see    kEvent::MasterEvent
 	 * @todo   Overwrites master event data with called event data, which makes 'parent_event' useless in most cases.
 	 */
 	public function CallSubEvent($name)
 	{
 		if ( strpos($name, ':') === false ) {
 			// PrefixSpecial not specified -> use from current event.
 			$name = $this->getPrefixSpecial() . ':' . $name;
 		}
 
 		$child_event = new kEvent($name);
 		$child_event->copyFrom($this, true);
 
 		$this->Application->HandleEvent($child_event);
 		$this->copyFrom($child_event);
 		$this->_specificParams = $child_event->_specificParams;
 	}
 
 	/**
 	 * Allows to copy data between events.
 	 *
 	 * @param kEvent  $source_event Source event.
 	 * @param boolean $inherit      Keep reference to source event in copied event.
 	 *
 	 * @return void
 	 */
 	public function copyFrom(kEvent $source_event, $inherit = false)
 	{
 		if ( $inherit ) {
 			$this->MasterEvent = $source_event;
 		}
 		else {
 			$this->status = $source_event->status;
 		}
 
 		$this->redirect = $source_event->redirect;
 		$this->_redirectParams = $source_event->_redirectParams;
 		$this->redirectScript = $source_event->redirectScript;
 		$this->_specificParams = $source_event->_specificParams;
 	}
 
 	/**
 	 * Returns all redirect parameters.
 	 *
 	 * @return array
 	 */
 	public function getRedirectParams()
 	{
 		return $this->_redirectParams;
 	}
 
 	/**
 	 * Returns redirect parameter.
 	 *
 	 * @param string $name Name.
 	 *
 	 * @return mixed
 	 */
 	public function getRedirectParam($name)
 	{
 		return array_key_exists($name, $this->_redirectParams) ? $this->_redirectParams[$name] : false;
 	}
 
 	/**
 	 * Set's redirect param for event.
 	 *
 	 * @param string $name  Name.
 	 * @param string $value Value.
 	 *
 	 * @return void
 	 */
 	public function SetRedirectParam($name, $value)
 	{
 		$this->_redirectParams[$name] = $value;
 	}
 
 	/**
 	 * Allows to merge passed redirect params hash with existing ones.
 	 *
 	 * @param array   $params Params.
 	 * @param boolean $append Append to existing parameters.
 	 *
 	 * @return void
 	 */
 	public function setRedirectParams(array $params, $append = true)
 	{
 		if ( $append ) {
 			$params = kUtil::array_merge_recursive($this->_redirectParams, $params);
 		}
 
 		$this->_redirectParams = $params;
 	}
 
 	/**
 	 * Allows to tell if this event was called some how (e.g. sub-event, hook) from event requested.
 	 *
 	 * @param string $event_key Event key in format: "[prefix[.special]:]event_name".
 	 *
 	 * @return boolean
 	 */
 	public function hasAncestor($event_key)
 	{
 		if ( strpos($event_key, ':') === false ) {
 			$event_key = $this->getPrefixSpecial() . ':' . $event_key;
 		}
 
 		return $this->Application->EventManager->eventRunning($event_key);
 	}
 
 	/**
 	 * Returns permission section associated with event.
 	 *
 	 * @return string
 	 * @throws Exception When permission section not specified for event's unit.
 	 */
 	public function getSection()
 	{
 		$perm_section = $this->getEventParam('PermSection');
 
 		if ( $perm_section ) {
 			return $perm_section;
 		}
 
 		// 1. get section by current top_prefix.
 		$top_prefix = $this->getEventParam('top_prefix');
 
 		if ( $top_prefix == false ) {
 			$top_prefix = $this->Application->GetTopmostPrefix($this->Prefix, true);
 			$this->setEventParam('top_prefix', $top_prefix);
 		}
 
 		$section = $this->Application->getUnitConfig($top_prefix)->getPermSectionByName('main');
 
 		// 2. check if this section has perm_prefix mapping to other prefix.
+		/** @var kSectionsHelper $sections_helper */
 		$sections_helper = $this->Application->recallObject('SectionsHelper');
-		/* @var $sections_helper kSectionsHelper */
 
 		$section_data =& $sections_helper->getSectionData($section);
 
 		if ( $section_data && isset($section_data['perm_prefix']) && $section_data['perm_prefix'] != $top_prefix ) {
 			$this->setEventParam('top_prefix', $section_data['perm_prefix']);
 			$section = $this->Application->getUnitConfig($section_data['perm_prefix'])->getPermSectionByName('main');
 		}
 
 		if ( !$section ) {
 			$error_msg = 'Permission <strong>section</strong> not specified for';
 			$error_msg .= ' prefix <strong>' . $top_prefix . '</strong>';
 			throw new Exception($error_msg);
 		}
 
 		return $section;
 	}
 
 	/**
 	 * Casts object to string.
 	 *
 	 * @return string
 	 */
 	public function __toString()
 	{
 		return $this->getPrefixSpecial() . ':' . $this->Name;
 	}
 
 }
Index: branches/5.3.x/core/kernel/utility/debugger.php
===================================================================
--- branches/5.3.x/core/kernel/utility/debugger.php	(revision 16518)
+++ branches/5.3.x/core/kernel/utility/debugger.php	(revision 16519)
@@ -1,2141 +1,2141 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	if( !class_exists('Debugger') ) {
 
 		/**
 		 * Contains misc functions, used by debugger (mostly copied from kUtil class)
 		 */
 		class DebuggerUtil {
 
 			/**
 			 * Trust information, provided by proxy
 			 *
 			 * @var bool
 			 */
 			public static $trustProxy = false;
 
 			/**
 			 * Checks if constant is defined and has positive value
 			 *
 			 * @param string $const_name
 			 * @return bool
 			 */
 			public static function constOn($const_name)
 			{
 				return defined($const_name) && constant($const_name);
 			}
 
 			/**
 			 * Define constant if it was not already defined before
 			 *
 			 * @param string $const_name
 			 * @param string $const_value
 			 * @access public
 			 */
 			public static function safeDefine($const_name, $const_value)
 			{
 				if ( !defined($const_name) ) {
 					define($const_name, $const_value);
 				}
 			}
 
 			/**
 			 * Formats file/memory size in nice way
 			 *
 			 * @param int $bytes
 			 * @return string
 			 * @access public
 			 */
 			public static function formatSize($bytes)
 			{
 				if ($bytes >= 1099511627776) {
 					$return = round($bytes / 1024 / 1024 / 1024 / 1024, 2);
 					$suffix = "TB";
 				} elseif ($bytes >= 1073741824) {
 					$return = round($bytes / 1024 / 1024 / 1024, 2);
 					$suffix = "GB";
 				} elseif ($bytes >= 1048576) {
 					$return = round($bytes / 1024 / 1024, 2);
 					$suffix = "MB";
 				} elseif ($bytes >= 1024) {
 					$return = round($bytes / 1024, 2);
 					$suffix = "KB";
 				} else {
 					$return = $bytes;
 					$suffix = "Byte";
 				}
 
 				$return .= ' '.$suffix;
 
 				return $return;
 			}
 
 			/**
 			 * Checks, that user IP address is within allowed range
 			 *
 			 * @param string $ip_list semi-column (by default) separated ip address list
 			 * @param string $separator ip address separator (default ";")
 			 *
 			 * @return bool
 			 */
 			public static function ipMatch($ip_list, $separator = ';')
 			{
 				if ( php_sapi_name() == 'cli' ) {
 					return false;
 				}
 
 				$ip_match = false;
 				$ip_addresses = $ip_list ? explode($separator, $ip_list) : Array ();
 				$client_ip = self::getClientIp();
 
 				foreach ($ip_addresses as $ip_address) {
 					if ( self::netMatch($ip_address, $client_ip) ) {
 						$ip_match = true;
 						break;
 					}
 				}
 
 				return $ip_match;
 			}
 
 			/**
 			 * Returns the client IP address.
 			 *
 			 * @return string The client IP address
 			 * @access public
 			 */
 			public static function getClientIp()
 			{
 				if ( self::$trustProxy ) {
 					if ( array_key_exists('HTTP_CLIENT_IP', $_SERVER) ) {
 						return $_SERVER['HTTP_CLIENT_IP'];
 					}
 
 					if ( array_key_exists('HTTP_X_FORWARDED_FOR', $_SERVER) ) {
 						$client_ip = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
 
 						foreach ($client_ip as $ip_address) {
 							$clean_ip_address = trim($ip_address);
 
 							if ( false !== filter_var($clean_ip_address, FILTER_VALIDATE_IP) ) {
 								return $clean_ip_address;
 							}
 						}
 
 						return '';
 					}
 				}
 
 				return $_SERVER['REMOTE_ADDR'];
 			}
 
 			/**
 			 * Checks, that given ip belongs to given subnet
 			 *
 			 * @param string $network
 			 * @param string $ip
 			 * @return bool
 			 * @access public
 			 */
 			public static function netMatch($network, $ip) {
 
 				$network = trim($network);
 				$ip = trim($ip);
 
 				if ( preg_replace('/[\d\.\/-]/', '', $network) != '' ) {
 					$network = gethostbyname($network);
 				}
 
 				if ($network == $ip) {
 					// comparing two ip addresses directly
 					return true;
 				}
 
 				$d = strpos($network, '-');
 				if ($d !== false) {
 					// ip address range specified
 					$from = ip2long(trim(substr($network, 0, $d)));
 					$to = ip2long(trim(substr($network, $d + 1)));
 
 					$ip = ip2long($ip);
 					return ($ip >= $from && $ip <= $to);
 				}
 				elseif (strpos($network, '/') !== false) {
 					// single subnet specified
 					$ip_arr = explode('/', $network);
 
 					if (!preg_match("@\d*\.\d*\.\d*\.\d*@", $ip_arr[0], $matches)) {
 						$ip_arr[0] .= '.0';    // Alternate form 194.1.4/24
 					}
 
 					$network_long = ip2long($ip_arr[0]);
 					$x = ip2long($ip_arr[1]);
 
 					$mask = long2ip($x) == $ip_arr[1] ? $x : (0xffffffff << (32 - $ip_arr[1]));
 					$ip_long = ip2long($ip);
 
 					return ($ip_long & $mask) == ($network_long & $mask);
 				}
 
 				return false;
 			}
 		}
 
 		/**
 		 * Main debugger class, that can be used with any In-Portal (or not) project
 		 */
 		class Debugger {
 
 			const ROW_TYPE_ERROR = 'error';
 
 			const ROW_TYPE_WARNING = 'warning';
 
 			const ROW_TYPE_NOTICE = 'notice';
 
 			const ROW_TYPE_SQL = 'sql';
 
 			const ROW_TYPE_OTHER = 'other';
 
 			/**
 			 * Holds reference to global KernelApplication instance
 			 *
 			 * @var kApplication
 			 * @access private
 			 */
 			private $Application = null;
 
 			/**
 			 * Stores last fatal error hash or 0, when no fatal error happened
 			 *
 			 * @var integer
 			 */
 			private $_fatalErrorHash = 0;
 
 			private $_filterTypes = Array ('error', 'sql', 'other');
 
 			/**
 			 * Counts warnings on the page
 			 *
 			 * @var int
 			 * @access public
 			 */
 			public $WarningCount = 0;
 
 			/**
 			 * Allows to track compile errors, like "stack-overflow"
 			 *
 			 * @var bool
 			 * @access private
 			 */
 			private $_compileError = false;
 
 			/**
 			 * Debugger data for building report
 			 *
 			 * @var Array
 			 * @access private
 			 */
 			private $Data = Array ();
 
 			/**
 			 * Holds information about each profiler record (start/end/description)
 			 *
 			 * @var Array
 			 * @access private
 			 */
 			private $ProfilerData = Array ();
 
 			/**
 			 * Holds information about total execution time per profiler key (e.g. total sql time)
 			 *
 			 * @var Array
 			 * @access private
 			 */
 			private $ProfilerTotals = Array ();
 
 			/**
 			 * Counts how much each of total types were called (e.g. total error count)
 			 *
 			 * @var Array
 			 * @access private
 			 */
 			private $ProfilerTotalCount = Array ();
 
 			/**
 			 * Holds information about all profile points registered
 			 *
 			 * @var Array
 			 * @access private
 			 */
 			private $ProfilePoints = Array ();
 
 			/**
 			 * Prevent recursion when processing debug_backtrace() function results
 			 *
 			 * @var Array
 			 * @access private
 			 */
 			private $RecursionStack = Array ();
 
 			/**
 			 * Cross browser debugger report scrollbar width detection
 			 *
 			 * @var int
 			 * @access private
 			 */
 			private $scrollbarWidth = 0;
 
 			/**
 			 * Remembers how much memory & time was spent on including files
 			 *
 			 * @var Array
 			 * @access public
 			 * @see kUtil::includeOnce
 			 */
 			public $IncludesData = Array ();
 
 			/**
 			 * Remembers maximal include deep level
 			 *
 			 * @var int
 			 * @access public
 			 * @see kUtil::includeOnce
 			 */
 			public $IncludeLevel = 0;
 
 			/**
 			 * Prevents report generation more then once
 			 *
 			 * @var bool
 			 * @access private
 			 */
 			private $_inReportPrinting = false;
 
 			/**
 			 * Transparent spacer image used in case of none spacer image defined via SPACER_URL constant.
 			 * Used while drawing progress bars (memory usage, time usage, etc.)
 			 *
 			 * @var string
 			 * @access private
 			 */
 			private $dummyImage = '';
 
 			/**
 			 * Temporary files created by debugger will be stored here
 			 *
 			 * @var string
 			 * @access private
 			 */
 			private $tempFolder = '';
 
 			/**
 			 * Debug rows will be separated using this string before writing to debug file
 			 *
 			 * @var string
 			 * @access private
 			 */
 			private $rowSeparator = '@@';
 
 			/**
 			 * Base URL for debugger includes
 			 *
 			 * @var string
 			 * @access private
 			 */
 			private $baseURL = '';
 
 			/**
 			 * Sub-folder, where In-Portal is installed
 			 *
 			 * @var string
 			 * @access private
 			 */
 			private $basePath = '';
 
 			/**
 			 * Holds last recorded timestamp (for appendTimestamp)
 			 *
 			 * @var int
 			 * @access private
 			 */
 			private $LastMoment;
 
 			/**
 			 * Determines, that current request is AJAX request
 			 *
 			 * @var bool
 			 * @access private
 			 */
 			private $_isAjax = false;
 
 			/**
 			 * Data, parsed from the editor url.
 			 *
 			 * @var array
 			 */
 			protected $editorUrlData = array('url' => '', 'params' => array());
 
 			/**
 			 * Creates instance of debugger
 			 */
 			public function __construct()
 			{
 				global $start, $dbg_options;
 
 				// check if user haven't defined DEBUG_MODE contant directly
 				if ( defined('DEBUG_MODE') && DEBUG_MODE ) {
 					die('error: constant DEBUG_MODE defined directly, please use <strong>$dbg_options</strong> array instead');
 				}
 
 				if ( class_exists('kUtil') ) {
 					DebuggerUtil::$trustProxy = kUtil::getSystemConfig()->get('TrustProxy');
 				}
 
 				// check IP before enabling debug mode
 				$ip_match = DebuggerUtil::ipMatch(isset($dbg_options['DBG_IP']) ? $dbg_options['DBG_IP'] : '');
 
 				if ( !$ip_match || (isset($_COOKIE['debug_off']) && $_COOKIE['debug_off']) ) {
 					define('DEBUG_MODE', 0);
 					return;
 				}
 
 				// debug is allowed for user, continue initialization
 				$this->InitDebugger();
 				$this->profileStart('kernel4_startup', 'Startup and Initialization of kernel4', $start);
 				$this->profileStart('script_runtime', 'Script runtime', $start);
 				$this->LastMoment = $start;
 
 				error_reporting(E_ALL & ~E_STRICT);
 
 				// show errors on screen in case if not in Zend Studio debugging
 				ini_set('display_errors', DebuggerUtil::constOn('DBG_ZEND_PRESENT') ? 0 : 1);
 
 				// vertical scrollbar width differs in Firefox and other browsers
 				$this->scrollbarWidth = $this->isGecko() ? 22 : 25;
 
 				$this->appendRequest();
 			}
 
 			/**
 			 * Set's default values to constants debugger uses
 			 *
 			 */
 			function InitDebugger()
 			{
 				global $dbg_options;
 
 				unset($dbg_options['DBG_IP']);
 
 				// Detect fact, that this session being debugged by Zend Studio
 				foreach ($_COOKIE as $cookie_name => $cookie_value) {
 					if (substr($cookie_name, 0, 6) == 'debug_') {
 						DebuggerUtil::safeDefine('DBG_ZEND_PRESENT', 1);
 						break;
 					}
 				}
 
 				DebuggerUtil::safeDefine('DBG_ZEND_PRESENT', 0); // set this constant value to 0 (zero) to debug debugger using Zend Studio
 
 				// set default values for debugger constants
 				$dbg_constMap = Array (
 					'DBG_USE_HIGHLIGHT'			=>	1,							// highlight output same as php code using "highlight_string" function
 					'DBG_WINDOW_WIDTH'			=>	700,						// set width of debugger window (in pixels) for better viewing large amount of debug data
 					'DBG_USE_SHUTDOWN_FUNC'		=>	DBG_ZEND_PRESENT ? 0 : 1,	// use shutdown function to include debugger code into output
 					'DBG_HANDLE_ERRORS'			=>	DBG_ZEND_PRESENT ? 0 : 1,	// handle all allowed by php (see php manual) errors instead of default handler
 					'DBG_DOMVIEWER'				=>	'/temp/domviewer.html',		// path to DOMViewer on website
 					'DOC_ROOT'					=>	str_replace('\\', '/', realpath($_SERVER['DOCUMENT_ROOT']) ), // windows hack
 					'DBG_LOCAL_BASE_PATH'		=>	'w:',						// replace DOC_ROOT in filenames (in errors) using this path
 					'DBG_EDITOR_URL'			=>	'file://%F:%L',
 					'DBG_SHORTCUT'				=>	'F12',						// Defines debugger activation shortcut (any symbols or Ctrl/Alt/Shift are allowed, e.g. Ctrl+Alt+F12)
 				);
 
 				// debugger is initialized before kHTTPQuery, so do jQuery headers check here too
 				if (array_key_exists('HTTP_X_REQUESTED_WITH', $_SERVER) && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest') {
 					$this->_isAjax = true;
 				}
 				elseif (array_key_exists('ajax', $_GET) && $_GET['ajax'] == 'yes') {
 					$this->_isAjax = true;
 				}
 
 				// user defined options override debugger defaults
 				$dbg_constMap = array_merge($dbg_constMap, $dbg_options);
 
 				if ($this->_isAjax && array_key_exists('DBG_SKIP_AJAX', $dbg_constMap) && $dbg_constMap['DBG_SKIP_AJAX']) {
 					$dbg_constMap['DBG_SKIP_REPORTING'] = 1;
 				}
 
 				// allows to validate unit configs via request variable
 				if ( !array_key_exists('DBG_VALIDATE_CONFIGS', $dbg_constMap) ) {
 					$dbg_constMap['DBG_VALIDATE_CONFIGS'] = array_key_exists('validate_configs', $_GET) ? (int)$_GET['validate_configs'] : 0;
 				}
 
 				// when validation configs, don't show sqls for better validation error displaying
 				if ($dbg_constMap['DBG_VALIDATE_CONFIGS']) {
 					$dbg_constMap['DBG_SQL_PROFILE'] = 0;
 				}
 
 				// when showing explain make shure, that debugger window is large enough
 				if (array_key_exists('DBG_SQL_EXPLAIN', $dbg_constMap) && $dbg_constMap['DBG_SQL_EXPLAIN']) {
 					$dbg_constMap['DBG_WINDOW_WIDTH'] = 1000;
 				}
 
 				foreach ($dbg_constMap as $dbg_constName => $dbg_constValue) {
 					DebuggerUtil::safeDefine($dbg_constName, $dbg_constValue);
 				}
 
 				$this->parseEditorUrl();
 			}
 
 			/**
 			 * Parses editor url.
 			 *
 			 * @return void
 			 */
 			protected function parseEditorUrl()
 			{
 				$components = parse_url(DBG_EDITOR_URL);
 
 				$this->editorUrlData['url'] = $components['scheme'] . '://' . $components['host'];
 
 				if ( isset($components['path']) ) {
 					$this->editorUrlData['url'] .= $components['path'];
 				}
 
 				if ( isset($components['query']) ) {
 					parse_str(html_entity_decode($components['query']), $this->editorUrlData['params']);
 				}
 			}
 
 			/**
 			 * Performs debugger initialization
 			 *
 			 * @return void
 			 */
 			private function InitReport()
 			{
 				if ( !class_exists('kApplication') ) {
 					return;
 				}
 
 				$application =& kApplication::Instance();
 
 				// string used to separate debugger records while in file (used in debugger dump filename too)
 				$this->rowSeparator = '@' . (/*is_object($application->Factory) &&*/ $application->InitDone ? $application->GetSID() : 0) . '@';
 //				$this->rowSeparator = '@' . rand(0, 100000) . '@';
 
 				// include debugger files from this url
 				$reg_exp = '/^' . preg_quote(FULL_PATH, '/') . '/';
 				$kernel_path = preg_replace($reg_exp, '', KERNEL_PATH, 1);
 				$this->baseURL = PROTOCOL . SERVER_NAME . (defined('PORT') ? ':' . PORT : '') . rtrim(BASE_PATH, '/') . $kernel_path . '/utility/debugger';
 
 				// store debugger cookies at this path
 				$this->basePath = rtrim(BASE_PATH, '/');
 
 				// save debug output in this folder
 				$this->tempFolder = defined('RESTRICTED') ? RESTRICTED : WRITEABLE . '/cache';
 			}
 
 			/**
 			 * Appends all passed variable values (without variable names) to debug output
 			 *
 			 * @return void
 			 * @access public
 			 */
 			public function dumpVars()
 			{
 				$dump_mode = 'var_dump';
 				$dumpVars = func_get_args();
 
 				if ( $dumpVars[count($dumpVars) - 1] === 'STRICT' ) {
 					$dump_mode = 'strict_var_dump';
 					array_pop($dumpVars);
 				}
 
 				foreach ($dumpVars as $varValue) {
 					$this->Data[] = Array ('value' => $varValue, 'debug_type' => $dump_mode);
 				}
 			}
 
 			/**
 			 * Transforms collected data at given index into human-readable HTML to place in debugger report
 			 *
 			 * @param int $dataIndex
 			 * @return string
 			 * @access private
 			 */
 			private function prepareHTML($dataIndex)
 			{
 				static $errors_displayed = 0;
 
 				$Data =& $this->Data[$dataIndex];
 				if ( $Data['debug_type'] == 'html' ) {
 					return $Data['html'];
 				}
 
 				switch ($Data['debug_type']) {
 					case 'error':
 						$errors_displayed++;
 						$fileLink = $this->getFileLink($Data['file'], $Data['line']);
 						$ret = '<b class="debug_error">' . $this->getErrorNameByCode($Data['no']) . ' (#' . $errors_displayed . ')</b>: ' . $Data['str'];
 						$ret .= ' in <b>' . $fileLink . '</b> on line <b>' . $Data['line'] . '</b>';
 						return $ret;
 						break;
 
 					case 'exception':
 						$fileLink = $this->getFileLink($Data['file'], $Data['line']);
 						$ret = '<b class="debug_error">' . $Data['exception_class'] . '</b>: ' . $Data['str'];
 						$ret .= ' in <b>' . $fileLink . '</b> on line <b>' . $Data['line'] . '</b>';
 						return $ret;
 						break;
 
 					case 'var_dump':
 						return $this->highlightString($this->print_r($Data['value'], true));
 						break;
 
 					case 'strict_var_dump':
 						return $this->highlightString(var_export($Data['value'], true));
 						break;
 
 					case 'trace':
 						ini_set('memory_limit', '500M');
 						$trace =& $Data['trace'];
 
 						$i = 0;
 						$traceCount = count($trace);
 						$ret = '';
 
 						while ( $i < $traceCount ) {
 							$traceRec =& $trace[$i];
 							$argsID = 'trace_args_' . $dataIndex . '_' . $i;
 
 							$has_args = isset($traceRec['args']);
 
 							if ( isset($traceRec['file']) ) {
 								$func_name = isset($traceRec['class']) ? $traceRec['class'] . $traceRec['type'] . $traceRec['function'] : $traceRec['function'];
 								$args_link = $has_args ? '<a href="javascript:$Debugger.ToggleTraceArgs(\'' . $argsID . '\');" title="Show/Hide Function Arguments"><b>Function</b></a>' : '<strong>Function</strong>';
 
 								$ret .= $args_link . ': ' . $this->getFileLink($traceRec['file'], $traceRec['line'], $func_name);
 								$ret .= ' in <b>' . basename($traceRec['file']) . '</b> on line <b>' . $traceRec['line'] . '</b><br>';
 							}
 							else {
 								$ret .= 'no file information available';
 							}
 
 							if ( $has_args ) {
 								// if parameter value is longer then 200 symbols, then leave only first 50
 								$args = $this->highlightString($this->print_r($traceRec['args'], true));
 								$ret .= '<div id="' . $argsID . '" style="display: none;">' . $args . '</div>';
 							}
 							$i++;
 						}
 						return $ret;
 						break;
 
 					case 'profiler':
 						$profileKey = $Data['profile_key'];
 						$Data =& $this->ProfilerData[$profileKey];
 						$runtime = ($Data['ends'] - $Data['begins']); // in seconds
 
 						$totals_key = getArrayValue($Data, 'totalsKey');
 						if ( $totals_key ) {
 							$total_before = $Data['totalsBefore'];
 							$total = $this->ProfilerTotals[$totals_key];
 
 							$div_width = Array ();
 							$total_width = ($this->getWindowWidth() - 10);
 							$div_width['before'] = round(($total_before / $total) * $total_width);
 							$div_width['current'] = round(($runtime / $total) * $total_width);
 							$div_width['left'] = round((($total - $total_before - $runtime) / $total) * $total_width);
 
 							$subtitle = array_key_exists('subtitle', $Data) ? ' (' . $Data['subtitle'] . ')' : '';
 							$ret = '<b>Name' . $subtitle . '</b>: ' . $Data['description'] . '<br />';
 
 							$additional = isset($Data['additional']) ? $Data['additional'] : Array ();
 							if ( isset($Data['file']) ) {
 								array_unshift($additional, Array ('name' => 'File', 'value' => $this->getFileLink($Data['file'], $Data['line'], basename($Data['file']) . ':' . $Data['line'])));
 							}
 							array_unshift($additional, Array ('name' => 'Runtime', 'value' => $runtime . 's'));
 
 							$ret .= '<div>'; //FF 3.5 needs this!
 							foreach ($additional as $mixed_param) {
 								$ret .= '[<strong>' . $mixed_param['name'] . '</strong>: ' . $mixed_param['value'] . '] ';
 							}
 
 							/*if ( isset($Data['file']) ) {
 								$ret .= '[<b>Runtime</b>: ' . $runtime . 's] [<b>File</b>: ' . $this->getFileLink($Data['file'], $Data['line'], basename($Data['file']) . ':' . $Data['line']) . ']<br />';
 							}
 							else {
 								$ret .= '<b>Runtime</b>: ' . $runtime . 's<br />';
 							}*/
 
 							$ret .= '</div>';
 
 							$ret .= '<div class="dbg_profiler" style="width: ' . $div_width['before'] . 'px; border-right: 0px; background-color: #298DDF;"><img src="' . $this->dummyImage . '" width="1" height="1"/></div>';
 							$ret .= '<div class="dbg_profiler" style="width: ' . $div_width['current'] . 'px; border-left: 0px; border-right: 0px; background-color: #EF4A4A;"><img src="' . $this->dummyImage . '" width="1" height="1"/></div>';
 							$ret .= '<div class="dbg_profiler" style="width: ' . $div_width['left'] . 'px; border-left: 0px; background-color: #DFDFDF;"><img src="' . $this->dummyImage . '" width="1" height="1"/></div>';
 
 							return $ret;
 						}
 						else {
 							return '<b>Name</b>: ' . $Data['description'] . '<br><b>Runtime</b>: ' . $runtime . 's';
 						}
 						break;
 
 					default:
 						return 'incorrect debug data';
 						break;
 				}
 			}
 
 			/**
 			 * Returns row type for debugger row.
 			 *
 			 * @param integer $data_index Index of the row.
 			 *
 			 * @return string
 			 */
 			protected function getRowType($data_index)
 			{
 				$data = $this->Data[$data_index];
 
 				switch ($data['debug_type']) {
 					case 'html':
 						if ( strpos($data['html'], 'SQL Total time') !== false ) {
 							return self::ROW_TYPE_SQL;
 						}
 						break;
 
 					case 'error':
 						$error_map = array(
 							'Fatal Error' => self::ROW_TYPE_ERROR,
 							'Warning' => self::ROW_TYPE_WARNING,
 							'Notice' => self::ROW_TYPE_NOTICE,
 						);
 
 						return $error_map[$this->getErrorNameByCode($data['no'])];
 						break;
 
 					case 'exception':
 						return self::ROW_TYPE_ERROR;
 						break;
 
 					case 'profiler':
 						if ( preg_match('/^sql_/', $data['profile_key']) ) {
 							return self::ROW_TYPE_SQL;
 						}
 						break;
 				}
 
 				return self::ROW_TYPE_OTHER;
 			}
 
 			/**
 			 * Returns debugger report window width excluding scrollbar
 			 *
 			 * @return int
 			 * @access private
 			 */
 			private function getWindowWidth()
 			{
 				return DBG_WINDOW_WIDTH - $this->scrollbarWidth - 8;
 			}
 
 			/**
 			 * Tells debugger to skip objects that are heavy in plan of memory usage while printing debug_backtrace results
 			 *
 			 * @param Object $object
 			 * @return bool
 			 * @access private
 			 */
 			private function IsBigObject(&$object)
 			{
 				$skip_classes = Array(
 					defined('APPLICATION_CLASS') ? APPLICATION_CLASS : 'kApplication',
 					'kFactory',
 					'kUnitConfigReader',
 					'NParser',
 				);
 
 				foreach ($skip_classes as $class_name) {
 					if ( strtolower(get_class($object)) == strtolower($class_name) ) {
 						return true;
 					}
 				}
 
 				return false;
 			}
 
 			/**
 			 * Advanced version of print_r (for debugger only). Don't print objects recursively.
 			 *
 			 * @param mixed   $p_array       Value to be printed.
 			 * @param boolean $return_output Return output or print it out.
 			 * @param integer $tab_count     Offset in tabs.
 			 *
 			 * @return string
 			 */
 			private function print_r(&$p_array, $return_output = false, $tab_count = -1)
 			{
 				static $first_line = true;
 
 				// not an array at all
 				if ( !is_array($p_array) ) {
 					switch ( gettype($p_array) ) {
 						case 'NULL':
 							return 'NULL' . "\n";
 							break;
 
 						case 'object':
 							return $this->processObject($p_array, $tab_count);
 							break;
 
 						case 'resource':
 							return (string)$p_array . "\n";
 							break;
 
 						default:
 							// number or string
 							if ( strlen($p_array) > 200 ) {
 								$p_array = substr($p_array, 0, 50) . ' ...';
 							}
 
 							return $p_array . "\n";
 							break;
 					}
 				}
 
 				$output = '';
 
 				if ( count($p_array) > 50 ) {
 					$array = array_slice($p_array, 0, 50);
 					$array[] = '...';
 				}
 				else {
 					$array = $p_array;
 				}
 
 				$tab_count++;
 				$output .= "Array\n" . str_repeat('    ', $tab_count) . "(\n";
 
 				$tab_count++;
 				$tabsign = $tab_count ? str_repeat('    ', $tab_count) : '';
 
 				$array_keys = array_keys($array);
 
 				foreach ($array_keys as $key) {
 					switch ( gettype($array[$key]) ) {
 						case 'array':
 							$output .= $tabsign . '[' . $key . '] = ' . $this->print_r($array[$key], true, $tab_count);
 							break;
 
 						case 'boolean':
 							$output .= $tabsign . '[' . $key . '] = ' . ($array[$key] ? 'true' : 'false') . "\n";
 							break;
 
 						case 'integer':
 						case 'double':
 						case 'string':
 							if ( strlen($array[$key]) > 200 ) {
 								$array[$key] = substr($array[$key], 0, 50) . ' ...';
 							}
 							$output .= $tabsign . '[' . $key . '] = ' . $array[$key] . "\n";
 							break;
 
 						case 'NULL':
 							$output .= $tabsign . '[' . $key . "] = NULL\n";
 							break;
 
 						case 'object':
 							$output .= $tabsign . '[' . $key . "] = ";
 							$output .= "Object (" . get_class($array[$key]) . ") = \n" . str_repeat('    ', $tab_count + 1) . "(\n";
 							$output .= $this->processObject($array[$key], $tab_count + 2);
 							$output .= str_repeat('    ', $tab_count + 1) . ")\n";
 							break;
 
 						default:
 							$output .= $tabsign . '[' . $key . '] unknown = ' . gettype($array[$key]) . "\n";
 							break;
 					}
 				}
 
 				$tab_count--;
 				$output .= str_repeat('    ', $tab_count) . ")\n";
 
 				if ( $first_line ) {
 					$first_line = false;
 					$output .= "\n";
 				}
 
 				$tab_count--;
 
 				if ( $return_output ) {
 					return $output;
 				}
 				else {
 					echo $output;
 				}
 
 				return true;
 			}
 
 			/**
 			 * Returns string representation of given object (more like print_r, but with recursion prevention check)
 			 *
 			 * @param Object $object
 			 * @param int $tab_count
 			 * @return string
 			 * @access private
 			 */
 			private function processObject(&$object, $tab_count)
 			{
 				$object_class = get_class($object);
 				if ( !in_array($object_class, $this->RecursionStack) ) {
 					if ( $this->IsBigObject($object) ) {
 						return 'SKIPPED (class: ' . $object_class . ")\n";
 					}
 
 					$attribute_names = get_class_vars($object_class);
 					if ( !$attribute_names ) {
 						return "NO_ATTRIBUTES\n";
 					}
 					else {
 						$output = '';
 						array_push($this->RecursionStack, $object_class);
 
 						$tabsign = $tab_count ? str_repeat('    ', $tab_count) : '';
 						foreach ($attribute_names as $attribute_name => $attribute_value) {
 							if ( is_object($object->$attribute_name) ) {
 								// it is object
 								$output .= $tabsign . '[' . $attribute_name . '] = ' . $this->processObject($object->$attribute_name, $tab_count + 1);
 							}
 							else {
 								$output .= $tabsign . '[' . $attribute_name . '] = ' . $this->print_r($object->$attribute_name, true, $tab_count);
 							}
 						}
 						array_pop($this->RecursionStack);
 						return $output;
 					}
 				}
 				else {
 					// object [in recursion stack]
 					return '*** RECURSION *** (class: ' . $object_class . ")\n";
 				}
 			}
 
 			/**
 			 * Format SQL Query using predefined formatting
 			 * and highlighting techniques
 			 *
 			 * @param string $sql
 			 * @return string
 			 * @access public
 			 */
 			public function formatSQL($sql)
 			{
 				$sql = trim(preg_replace('/(\n|\t| )+/is', ' ', $sql));
 
 				// whitespace in the beginning of the regex is to avoid splitting inside words, for example "FROM int_ConfigurationValues" into "FROM intConfiguration\n\tValues"
 				$formatted_sql = preg_replace('/\s(CREATE TABLE|DROP TABLE|SELECT|UPDATE|SET|REPLACE|INSERT|DELETE|VALUES|FROM|LEFT JOIN|INNER JOIN|LIMIT|WHERE|HAVING|GROUP BY|ORDER BY)\s/is', "\n\t$1 ", ' ' . $sql);
 				$formatted_sql = $this->highlightString($formatted_sql);
 
 				if ( defined('DBG_SQL_EXPLAIN') && DBG_SQL_EXPLAIN ) {
 					if ( substr($sql, 0, 6) == 'SELECT' ) {
 						$formatted_sql .= '<br/>' . '<strong>Explain</strong>:<br /><br />';
 						$explain_result = $this->Application->Conn->Query('EXPLAIN ' . $sql, null, true);
 
 						$explain_table = '';
 						foreach ($explain_result as $explain_row) {
 							if ( !$explain_table ) {
 								// first row -> draw header
 								$explain_table .= '<tr class="explain_header"><td>' . implode('</td><td>', array_keys($explain_row)) . '</td></tr>';
 							}
 							$explain_table .= '<tr><td>' . implode('</td><td>', $explain_row) . '</td></tr>';
 						}
 
 						$formatted_sql .= '<table class="dbg_explain_table">' . $explain_table . '</table>';
 					}
 				}
 
 				return $formatted_sql;
 			}
 
 			/**
 			 * Highlights given string using "highlight_string" method
 			 *
 			 * @param string $string
 			 * @return string
 			 * @access public
 			 */
 			public function highlightString($string)
 			{
 				if ( !(defined('DBG_USE_HIGHLIGHT') && DBG_USE_HIGHLIGHT) || $this->_compileError ) {
 					return nl2br($string);
 				}
 
 				$string = str_replace(Array ('\\', '/'), Array ('_no_match_string_', '_n_m_s_'), $string);
 				$this->_compileError = true; // next line is possible cause of compile error
 				$string = highlight_string('<?php ' . $string . ' ?>', true);
 				$this->_compileError = false;
 
 				$string = str_replace(Array ('_no_match_string_', '_n_m_s_'), Array ('\\', '/'), $string);
 
 				if ( strlen($string) >= 65536 ) {
 					// preg_replace will fail, when string is longer, then 65KB
 					return str_replace(Array ('&lt;?php&nbsp;', '?&gt;'), '', $string);
 				}
 
 				return preg_replace('/&lt;\?(.*)php&nbsp;(.*)\?&gt;/Us', '\\2', $string);
 			}
 
 			/**
 			 * Determine by php type of browser used to show debugger
 			 *
 			 * @return bool
 			 * @access private
 			 */
 			private function isGecko()
 			{
 				// we need isset because we may run scripts from shell with no user_agent at all
 				return isset($_SERVER['HTTP_USER_AGENT']) && strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'firefox') !== false;
 			}
 
 			/**
 			 * Returns link for editing php file (from error) in external editor
 			 *
 			 * @param string $file filename with path from root folder
 			 * @param int $line_number line number in file where error is found
 			 * @param string $title text to show on file edit link
 			 * @return string
 			 * @access public
 			 */
 			public function getFileLink($file, $line_number = 1, $title = '')
 			{
 				if ( !$title ) {
 					$title = str_replace('/', '\\', $this->getLocalFile($file));
 				}
 
 				$local_file = $this->getLocalFile($file);
 				$url_params = $this->editorUrlData['params'];
 
 				foreach ( $url_params as $param_name => $param_value ) {
 					$url_params[$param_name] = str_replace(
 						array('%F', '%L'),
 						array($local_file, $line_number),
 						$param_value
 					);
 				}
 
 				$url = $this->editorUrlData['url'] . '?' . http_build_query($url_params);
 
 				return '<a href="' . $url . '">' . $title . '</a>';
 			}
 
 			/**
 			 * Converts filepath on server to filepath in mapped DocumentRoot on developer pc
 			 *
 			 * @param string $remoteFile
 			 * @return string
 			 * @access private
 			 */
 			private function getLocalFile($remoteFile)
 			{
 				return preg_replace('/^' . preg_quote(DOC_ROOT, '/') . '/', DBG_LOCAL_BASE_PATH, $remoteFile, 1);
 			}
 
 			/**
 			 * Appends call trace till this method call
 			 *
 			 * @param int $levels_to_shift
 			 * @return void
 			 * @access public
 			 */
 			public function appendTrace($levels_to_shift = 1)
 			{
 				$levels_shifted = 0;
 				$trace = debug_backtrace();
 
 				while ( $levels_shifted < $levels_to_shift ) {
 					array_shift($trace);
 					$levels_shifted++;
 				}
 
 				$this->Data[] = Array ('trace' => $trace, 'debug_type' => 'trace');
 			}
 
 			/**
 			 * Appends call trace till this method call
 			 *
 			 * @param Exception $exception
 			 * @return void
 			 * @access private
 			 */
 			private function appendExceptionTrace(&$exception)
 			{
 				$trace = $exception->getTrace();
 				$this->Data[] = Array('trace' => $trace, 'debug_type' => 'trace');
 			}
 
 			/**
 			 * Adds memory usage statistics
 			 *
 			 * @param string $msg
 			 * @param int $used
 			 * @return void
 			 * @access public
 			 */
 			public function appendMemoryUsage($msg, $used = null)
 			{
 				if ( !isset($used) ) {
 					$used = round(memory_get_usage() / 1024);
 				}
 
 				$this->appendHTML('<b>Memory usage</b> ' . $msg . ' ' . $used . 'Kb');
 			}
 
 			/**
 			 * Appends HTML code without transformations
 			 *
 			 * @param string $html
 			 * @return void
 			 * @access public
 			 */
 			public function appendHTML($html)
 			{
 				$this->Data[] = Array ('html' => $html, 'debug_type' => 'html');
 			}
 
 			/**
 			 * Returns instance of FirePHP class
 			 *
 			 * @return FirePHP
 			 * @link http://www.firephp.org/HQ/Use.htm
 			 */
 			function firePHP()
 			{
 				require_once('FirePHPCore/FirePHP.class.php');
 
 				return FirePHP::getInstance(true);
 			}
 
 			/**
 			 * Change debugger info that was already generated before.
 			 * Returns true if html was set.
 			 *
 			 * @param int $index
 			 * @param string $html
 			 * @param string $type = {'append','prepend','replace'}
 			 * @return bool
 			 * @access public
 			 */
 			public function setHTMLByIndex($index, $html, $type = 'append')
 			{
 				if ( !isset($this->Data[$index]) || $this->Data[$index]['debug_type'] != 'html' ) {
 					return false;
 				}
 
 				switch ( $type ) {
 					case 'append':
 						$this->Data[$index]['html'] .= '<br>' . $html;
 						break;
 
 					case 'prepend':
 						$this->Data[$index]['html'] = $this->Data[$index]['html'] . '<br>' . $html;
 						break;
 
 					case 'replace':
 						$this->Data[$index]['html'] = $html;
 						break;
 				}
 
 				return true;
 			}
 
 			/**
 			 * Move $debugLineCount lines of input from debug output
 			 * end to beginning.
 			 *
 			 * @param int $debugLineCount
 			 * @return void
 			 * @access private
 			 */
 			private function moveToBegin($debugLineCount)
 			{
 				$lines = array_splice($this->Data, count($this->Data) - $debugLineCount, $debugLineCount);
 				$this->Data = array_merge($lines, $this->Data);
 			}
 
 			/**
 			 * Moves all debugger report lines after $debugLineCount into $new_row position
 			 *
 			 * @param int $new_row
 			 * @param int $debugLineCount
 			 * @return void
 			 * @access private
 			 */
 			private function moveAfterRow($new_row, $debugLineCount)
 			{
 				$lines = array_splice($this->Data, count($this->Data) - $debugLineCount, $debugLineCount);
 				$rows_before = array_splice($this->Data, 0, $new_row, $lines);
 				$this->Data = array_merge($rows_before, $this->Data);
 			}
 
 			/**
 			 * Appends HTTP REQUEST information to debugger report
 			 *
 			 * @return void
 			 * @access private
 			 */
 			private function appendRequest()
 			{
 				if ( isset($_SERVER['SCRIPT_FILENAME']) ) {
 					$script = $_SERVER['SCRIPT_FILENAME'];
 				}
 				else {
 					$script = $_SERVER['DOCUMENT_ROOT'] . $_SERVER['PHP_SELF'];
 				}
 
 				$this->appendHTML('ScriptName: <b>' . $this->getFileLink($script, 1, basename($script)) . '</b> (<b>' . dirname($script) . '</b>)');
 				if ( $this->_isAjax ) {
 					$this->appendHTML('RequestURI: ' . $_SERVER['REQUEST_URI'] . ' (QS Length:' . strlen($_SERVER['QUERY_STRING']) . ')');
 				}
 
 				$tools_html = '	<table style="width: ' . $this->getWindowWidth() . 'px;">
 									<tr>
 										<td>' . $this->_getDomViewerHTML() . '</td>
 										<td>' . $this->_getToolsHTML() . '</td>
 									</tr>
 								</table>';
 				$this->appendHTML($tools_html);
 
 				ob_start();
 				?>
 				<table border="0" cellspacing="0" cellpadding="0" class="dbg_flat_table" style="width: <?php echo $this->getWindowWidth(); ?>px;">
 					<thead style="font-weight: bold;">
 						<td width="20">Src</td><td>Name</td><td>Value</td>
 					</thead>
 				<?php
 					$super_globals = Array ('GE' => $_GET, 'PO' => $_POST, 'CO' => $_COOKIE);
 
 					foreach ($super_globals as $prefix => $data) {
 						foreach ($data as $key => $value) {
 							if ( !is_array($value) && trim($value) == '' ) {
 								$value = '<b class="debug_error">no value</b>';
 							}
 							else {
 								$value = htmlspecialchars($this->print_r($value, true), ENT_QUOTES, 'UTF-8');
 							}
 
 							echo '<tr><td>' . $prefix . '</td><td>' . $key . '</td><td>' . $value . '</td></tr>';
 						}
 					}
 				?>
 				</table>
 				<?php
 				$this->appendHTML(ob_get_contents());
 				ob_end_clean();
 			}
 
 			/**
 			 * Appends php session content to debugger output
 			 *
 			 * @return void
 			 * @access private
 			 */
 			private function appendSession()
 			{
 				if ( isset($_SESSION) && $_SESSION ) {
 					$this->appendHTML('PHP Session: [<b>' . ini_get('session.name') . '</b>]');
 					$this->dumpVars($_SESSION);
 					$this->moveToBegin(2);
 				}
 			}
 
 			/**
 			 * Starts profiling of a given $key
 			 *
 			 * @param string $key
 			 * @param string $description
 			 * @param int $timeStamp
 			 * @return void
 			 * @access public
 			 */
 			public function profileStart($key, $description = null, $timeStamp = null)
 			{
 				if ( !isset($timeStamp) ) {
 					$timeStamp = microtime(true);
 				}
 				$this->ProfilerData[$key] = Array ('begins' => $timeStamp, 'ends' => 5000, 'debuggerRowID' => count($this->Data));
 				if ( isset($description) ) {
 					$this->ProfilerData[$key]['description'] = $description;
 				}
 
 				if ( substr($key, 0, 4) == 'sql_' ) {
 					// append place from what was called
 					$trace_results = debug_backtrace();
 					$trace_count = count($trace_results);
 					$i = 0;
 					while ( $i < $trace_count ) {
 						if ( !isset($trace_results[$i]['file']) ) {
 							$i++;
 							continue;
 						}
 
 						$trace_file = basename($trace_results[$i]['file']);
 						if ( $trace_file != 'db_connection.php' && $trace_file != 'db_load_balancer.php' && $trace_file != 'adodb.inc.php' ) {
 							break;
 						}
 						$i++;
 					}
 
 					$this->ProfilerData[$key]['file'] = $trace_results[$i]['file'];
 					$this->ProfilerData[$key]['line'] = $trace_results[$i]['line'];
 
 					if ( isset($trace_results[$i + 1]['object']) && isset($trace_results[$i + 1]['object']->Prefix) ) {
+						/** @var kBase $object */
 						$object =& $trace_results[$i + 1]['object'];
-						/* @var $object kBase */
 
 						$prefix_special = rtrim($object->Prefix . '.' . $object->Special, '.');
 						$this->ProfilerData[$key]['prefix_special'] = $prefix_special;
 					}
 
 					unset($trace_results);
 				}
 
 				$this->Data[] = Array ('profile_key' => $key, 'debug_type' => 'profiler');
 			}
 
 			/**
 			 * Ends profiling for a given $key
 			 *
 			 * @param string $key
 			 * @param string $description
 			 * @param int $timeStamp
 			 * @return void
 			 * @access public
 			 */
 			public function profileFinish($key, $description = null, $timeStamp = null)
 			{
 				if ( !isset($timeStamp) ) {
 					$timeStamp = microtime(true);
 				}
 				$this->ProfilerData[$key]['ends'] = $timeStamp;
 
 				if ( isset($description) ) {
 					$this->ProfilerData[$key]['description'] = $description;
 				}
 
 				if ( substr($key, 0, 4) == 'sql_' ) {
 					$func_arguments = func_get_args();
 					$rows_affected = $func_arguments[3];
 
 					$additional = Array ();
 
 					if ( $rows_affected > 0 ) {
 						$additional[] = Array ('name' => 'Affected Rows', 'value' => $rows_affected);
 
 						if ( isset($func_arguments[4]) ) {
 							if ( strlen($func_arguments[4]) > 200 ) {
 								$func_arguments[4] = substr($func_arguments[4], 0, 50) . ' ...';
 							}
 
 							$additional[] = Array ('name' => 'Result', 'value' => $func_arguments[4]);
 						}
 					}
 
 					$additional[] = Array ('name' => 'Query Number', 'value' => $func_arguments[5]);
 
 					if ( $func_arguments[6] ) {
 						$this->profilerAddTotal('cachable_queries', $key);
 						$this->ProfilerData[$key]['subtitle'] = 'cachable';
 					}
 
 					if ( (string)$func_arguments[7] !== '' ) {
 						$additional[] = Array ('name' => 'Server #', 'value' => $func_arguments[7]);
 					}
 
 					if ( array_key_exists('prefix_special', $this->ProfilerData[$key]) ) {
 						$additional[] = Array ('name' => 'PrefixSpecial', 'value' => $this->ProfilerData[$key]['prefix_special']);
 					}
 
 					$this->ProfilerData[$key]['additional'] =& $additional;
 				}
 			}
 
 			/**
 			 * Collects total execution time from profiler record
 			 *
 			 * @param string $total_key
 			 * @param string $key
 			 * @param int $value
 			 * @return void
 			 * @access public
 			 */
 			public function profilerAddTotal($total_key, $key = null, $value = null)
 			{
 				if ( !isset($this->ProfilerTotals[$total_key]) ) {
 					$this->ProfilerTotals[$total_key] = 0;
 					$this->ProfilerTotalCount[$total_key] = 0;
 				}
 
 				if ( !isset($value) ) {
 					$value = $this->ProfilerData[$key]['ends'] - $this->ProfilerData[$key]['begins'];
 				}
 
 				if ( isset($key) ) {
 					$this->ProfilerData[$key]['totalsKey'] = $total_key;
 					$this->ProfilerData[$key]['totalsBefore'] = $this->ProfilerTotals[$total_key];
 				}
 
 				$this->ProfilerTotals[$total_key] += $value;
 				$this->ProfilerTotalCount[$total_key]++;
 			}
 
 			/**
 			 * Traces relative code execution speed between this method calls
 			 *
 			 * @param string $message
 			 * @return void
 			 * @access public
 			 */
 			public function appendTimestamp($message)
 			{
 				global $start;
 
 				$time = microtime(true);
 				$from_last = $time - $this->LastMoment;
 				$from_start = $time - $start;
 				$this->appendHTML(sprintf("<strong>%s</strong> %.5f from last %.5f from start", $message, $from_last, $from_start));
 				$this->LastMoment = $time;
 			}
 
 			/**
 			 * Returns unique ID for each method call
 			 *
 			 * @return int
 			 * @access public
 			 */
 			public function generateID()
 			{
 				list($usec, $sec) = explode(' ', microtime());
 
 				$id_part_1 = substr($usec, 4, 4);
 				$id_part_2 = mt_rand(1, 9);
 				$id_part_3 = substr($sec, 6, 4);
 				$digit_one = substr($id_part_1, 0, 1);
 
 				if ( $digit_one == 0 ) {
 					$digit_one = mt_rand(1, 9);
 					$id_part_1 = preg_replace('/^0/', '', $id_part_1);
 					$id_part_1 = $digit_one . $id_part_1;
 				}
 
 				return $id_part_1 . $id_part_2 . $id_part_3;
 			}
 
 			/**
 			 * Returns error name based on it's code
 			 *
 			 * @param int $error_code
 			 * @return string
 			 * @access private
 			 */
 			private function getErrorNameByCode($error_code)
 			{
 				$error_map = Array (
 					'Fatal Error' 	=>	Array (E_RECOVERABLE_ERROR, E_USER_ERROR, E_ERROR, E_CORE_ERROR, E_COMPILE_ERROR, E_PARSE),
 					'Warning'		=>	Array (E_WARNING, E_USER_WARNING, E_CORE_WARNING, E_COMPILE_WARNING),
 					'Notice'		=>	Array (E_NOTICE, E_USER_NOTICE, E_STRICT),
 				);
 
 				if ( defined('E_DEPRECATED') ) {
 					// since PHP 5.3
 					$error_map['Notice'][] = E_DEPRECATED;
 					$error_map['Notice'][] = E_USER_DEPRECATED;
 				}
 
 				foreach ($error_map as $error_name => $error_codes) {
 					if ( in_array($error_code, $error_codes) ) {
 						return $error_name;
 					}
 				}
 
 				return '';
 			}
 
 			/**
 			 * Returns profile total key (check against missing key too)
 			 *
 			 * @param string $key
 			 * @return int
 			 * @access private
 			 */
 			private function getProfilerTotal($key)
 			{
 				if ( isset($this->ProfilerTotalCount[$key]) ) {
 					return (int)$this->ProfilerTotalCount[$key];
 				}
 
 				return 0;
 			}
 
 			/**
 			 * Counts how much calls were made to a place, where this method is called (basic version of profiler)
 			 *
 			 * @param string $title
 			 * @param int $level
 			 * @return void
 			 * @access public
 			 */
 			public function ProfilePoint($title, $level = 1)
 			{
 				$trace_results = debug_backtrace();
 				$level = min($level, count($trace_results) - 1);
 
 				do {
 					$point = $trace_results[$level];
 					$location = $point['file'] . ':' . $point['line'];
 					$level++;
 					$has_more = isset($trace_results[$level]);
 				} while ( $has_more && $point['function'] == $trace_results[$level]['function'] );
 
 				if ( !isset($this->ProfilePoints[$title]) ) {
 					$this->ProfilePoints[$title] = Array ();
 				}
 
 				if ( !isset($this->ProfilePoints[$title][$location]) ) {
 					$this->ProfilePoints[$title][$location] = 0;
 				}
 
 				$this->ProfilePoints[$title][$location]++;
 			}
 
 			/**
 			 * Generates report
 			 *
 			 * @param boolean $return_result       Returns or output report contents.
 			 * @param boolean $clean_output_buffer Clean output buffers before displaying anything.
 			 * @param boolean $is_shutdown_func    Called from shutdown function.
 			 *
 			 * @return string
 			 */
 			public function printReport($return_result = false, $clean_output_buffer = true, $is_shutdown_func = false)
 			{
 				if ( $this->_inReportPrinting ) {
 					// don't print same report twice (in case if shutdown function used + compression + fatal error)
 					return '';
 				}
 
 				$this->_inReportPrinting = true;
 				$last_error = error_get_last();
 
 				if ( !is_null($last_error) && $is_shutdown_func ) {
 					$this->saveError(
 						$last_error['type'],
 						$last_error['message'],
 						$last_error['file'],
 						$last_error['line'],
 						null,
 						$is_shutdown_func
 					);
 				}
 
 				$this->profileFinish('script_runtime');
 				$this->_breakOutOfBuffering(!$return_result);
 
 				$debugger_start = memory_get_usage();
 
 				if ( defined('SPACER_URL') ) {
 					$this->dummyImage = SPACER_URL;
 				}
 
 				$this->InitReport(); // set parameters required by AJAX
 
 				// defined here, because user can define this constant while script is running, not event before debugger is started
 				DebuggerUtil::safeDefine('DBG_RAISE_ON_WARNINGS', 0);
 				DebuggerUtil::safeDefine('DBG_TOOLBAR_BUTTONS', 1);
 
 				$this->appendSession(); // show php session if any
 
 				// ensure, that 1st line of debug output always is this one:
 				$top_line = '<table cellspacing="0" cellpadding="0" style="width: ' . $this->getWindowWidth() . 'px; margin: 0px;"><tr><td align="left" width="50%">[<a href="javascript:window.location.reload();">Reload Frame</a>] [<a href="javascript:$Debugger.Toggle(27);">Hide Debugger</a>] [<a href="javascript:$Debugger.Clear();">Clear Debugger</a>]</td><td align="right" width="50%">[Current Time: <b>' . date('H:i:s') . '</b>] [File Size: <b>#DBG_FILESIZE#</b>]</td></tr><tr><td align="left" colspan="2" style="padding-top: 5px;">' . $this->getFilterDropdown() . '</td></tr></table>';
 
 				$this->appendHTML($top_line);
 				$this->moveToBegin(1);
 
 				if ( count($this->ProfilePoints) > 0 ) {
 					foreach ($this->ProfilePoints as $point => $locations) {
 						arsort($this->ProfilePoints[$point]);
 					}
 
 					$this->appendHTML($this->highlightString($this->print_r($this->ProfilePoints, true)));
 				}
 
 				if ( DebuggerUtil::constOn('DBG_SQL_PROFILE') && isset($this->ProfilerTotals['sql']) ) {
 					// sql query profiling was enabled -> show totals
 					if ( array_key_exists('cachable_queries', $this->ProfilerTotalCount) ) {
 						$append = ' <strong>Cachable queries</strong>: ' . $this->ProfilerTotalCount['cachable_queries'];
 					}
 					else {
 						$append = '';
 					}
 
 					$this->appendHTML('<b>SQL Total time:</b> ' . $this->ProfilerTotals['sql'] . ' <b>Number of queries</b>: ' . $this->ProfilerTotalCount['sql'] . $append);
 				}
 
 				if ( DebuggerUtil::constOn('DBG_PROFILE_INCLUDES') && isset($this->ProfilerTotals['includes']) ) {
 					// included file profiling was enabled -> show totals
 					$this->appendHTML('<b>Included Files Total time:</b> ' . $this->ProfilerTotals['includes'] . ' Number of includes: ' . $this->ProfilerTotalCount['includes']);
 				}
 
 				if ( DebuggerUtil::constOn('DBG_PROFILE_MEMORY') ) {
 					// detailed memory usage reporting by objects was enabled -> show totals
 					$this->appendHTML('<b>Memory used by Objects:</b> ' . round($this->ProfilerTotals['objects'] / 1024, 2) . 'Kb');
 				}
 
 				if ( DebuggerUtil::constOn('DBG_INCLUDED_FILES') ) {
 					$files = get_included_files();
 					$this->appendHTML('<strong>Included files:</strong>');
 					foreach ($files as $file) {
 						$this->appendHTML($this->getFileLink($this->getLocalFile($file)) . ' (' . round(filesize($file) / 1024, 2) . 'Kb)');
 					}
 				}
 
 				if ( DebuggerUtil::constOn('DBG_PROFILE_INCLUDES') ) {
 					$totals = $totals_configs = Array ('mem' => 0, 'time' => 0);
 					$this->appendHTML('<b>Included files statistics:</b>' . (DebuggerUtil::constOn('DBG_SORT_INCLUDES_MEM') ? ' (sorted by memory usage)' : ''));
 
 					if ( is_array($this->IncludesData['mem']) ) {
 						if ( DebuggerUtil::constOn('DBG_SORT_INCLUDES_MEM') ) {
 							array_multisort($this->IncludesData['mem'], SORT_DESC, $this->IncludesData['file'], $this->IncludesData['time'], $this->IncludesData['level']);
 						}
 
 						foreach ($this->IncludesData['file'] as $key => $file_name) {
 							$this->appendHTML(str_repeat('&nbsp;->&nbsp;', ($this->IncludesData['level'][$key] >= 0 ? $this->IncludesData['level'][$key] : 0)) . $file_name . ' Mem: ' . sprintf("%.4f Kb", $this->IncludesData['mem'][$key] / 1024) . ' Time: ' . sprintf("%.4f", $this->IncludesData['time'][$key]));
 
 							if ( $this->IncludesData['level'][$key] == 0 ) {
 								$totals['mem'] += $this->IncludesData['mem'][$key];
 								$totals['time'] += $this->IncludesData['time'][$key];
 							}
 							elseif ( $this->IncludesData['level'][$key] == -1 ) {
 								$totals_configs['mem'] += $this->IncludesData['mem'][$key];
 								$totals_configs['time'] += $this->IncludesData['time'][$key];
 							}
 						}
 
 						$this->appendHTML('<b>Sub-Total classes:</b> ' . ' Mem: ' . sprintf("%.4f Kb", $totals['mem'] / 1024) . ' Time: ' . sprintf("%.4f", $totals['time']));
 						$this->appendHTML('<b>Sub-Total configs:</b> ' . ' Mem: ' . sprintf("%.4f Kb", $totals_configs['mem'] / 1024) . ' Time: ' . sprintf("%.4f", $totals_configs['time']));
 						$this->appendHTML('<span class="error"><b>Grand Total:</b></span> ' . ' Mem: ' . sprintf("%.4f Kb", ($totals['mem'] + $totals_configs['mem']) / 1024) . ' Time: ' . sprintf("%.4f", $totals['time'] + $totals_configs['time']));
 					}
 				}
 
 				$skip_reporting = DebuggerUtil::constOn('DBG_SKIP_REPORTING') || DebuggerUtil::constOn('DBG_ZEND_PRESENT');
 
 				if ( ($this->_isAjax && !DebuggerUtil::constOn('DBG_SKIP_AJAX')) || !$skip_reporting ) {
 					$debug_file = $this->tempFolder . '/debug_' . $this->rowSeparator . '.txt';
 					if ( file_exists($debug_file) ) {
 						unlink($debug_file);
 					}
 
 					$i = 0;
 					$fp = fopen($debug_file, 'a');
 					$lineCount = count($this->Data);
 
 					while ( $i < $lineCount ) {
 						$html = $this->prepareHTML($i);
 						$row_type = $this->getRowType($i);
 
 						fwrite($fp, json_encode(Array ('html' => $html, 'row_type' => $row_type)) . $this->rowSeparator);
 						$i++;
 					}
 
 					fclose($fp);
 				}
 
 				if ( $skip_reporting ) {
 					// let debugger write report and then don't output anything
 					return '';
 				}
 
 				$application =& kApplication::Instance();
 				$dbg_path = str_replace(FULL_PATH, '', $this->tempFolder);
 
 				$debugger_params = Array (
 					'FilterTypes' => $this->_filterTypes,
 					'RowSeparator' => $this->rowSeparator,
 					'ErrorsCount' => (int)$this->getProfilerTotal('error_handling'),
 					'IsFatalError' => $this->_fatalErrorHappened(),
 					'SQLCount' => (int)$this->getProfilerTotal('sql'),
 					'SQLTime' => isset($this->ProfilerTotals['sql']) ? sprintf('%.5f', $this->ProfilerTotals['sql']) : 0,
 					'ScriptTime' => sprintf('%.5f', $this->ProfilerData['script_runtime']['ends'] - $this->ProfilerData['script_runtime']['begins']),
 					'ScriptMemory' => DebuggerUtil::formatSize($this->getMemoryUsed($debugger_start)),
 					'Shortcut' => DBG_SHORTCUT,
 				);
 
 				ob_start();
 				// the <script .. /script> and hidden div helps browser to break out of script tag or attribute esacped
 				// with " or ' in case fatal error (or user-error) occurs inside it in compiled template,
 				// otherwise it has no effect
 			?>
 					<div style="display: none" x='nothing'><script></script></div><html><body></body></html>
 					<link rel="stylesheet" rev="stylesheet" href="<?php echo $this->baseURL; ?>/debugger.css?v2" type="text/css" media="screen" />
 					<script type="text/javascript" src="<?php echo $this->baseURL; ?>/debugger.js?v4"></script>
 
 					<script type="text/javascript">
 						var $Debugger = new Debugger(<?php echo json_encode($debugger_params); ?>);
 						$Debugger.createEnvironment(<?php echo DBG_WINDOW_WIDTH; ?>, <?php echo $this->getWindowWidth(); ?>);
 
 						$Debugger.DOMViewerURL = '<?php echo constant('DBG_DOMVIEWER'); ?>';
 						$Debugger.DebugURL = '<?php echo $this->baseURL.'/debugger_responce.php?sid='.$this->rowSeparator.'&path='.urlencode($dbg_path); ?>';
 						$Debugger.EventURL = '<?php echo /*is_object($application->Factory) &&*/ $application->InitDone ? $application->HREF('dummy', '', Array ('pass' => 'm', '__NO_REWRITE__' => 1)) : ''; ?>';
 						$Debugger.BasePath = '<?php echo $this->basePath; ?>';
 						<?php
 							$is_install = defined('IS_INSTALL') && IS_INSTALL;
 
 							if ( $this->_fatalErrorHappened()
 								|| (!$is_install && DBG_RAISE_ON_WARNINGS && $this->WarningCount)
 							) {
 								echo '$Debugger.Toggle();';
 							}
 							if ( DBG_TOOLBAR_BUTTONS ) {
 								echo '$Debugger.AddToolbar("$Debugger");';
 							}
 						?>
 						window.focus();
 					</script>
 				<?php
 					if ( $return_result ) {
 						$ret = ob_get_contents();
 
 						if ( $clean_output_buffer ) {
 							ob_end_clean();
 						}
 
 						$ret .= $this->getShortReport($this->getMemoryUsed($debugger_start));
 
 						return $ret;
 					}
 					else {
 						if ( !DebuggerUtil::constOn('DBG_HIDE_FULL_REPORT') ) {
 							$this->_breakOutOfBuffering();
 						}
 						elseif ( $clean_output_buffer ) {
 							ob_clean();
 						}
 
 						echo $this->getShortReport($this->getMemoryUsed($debugger_start));
 					}
 
 				return '';
 			}
 
 			function getFilterDropdown()
 			{
 				$filter_options = '';
 
 				foreach ( $this->_filterTypes as $filter_type ) {
 					$filter_options .= '<option value="' . $filter_type . '">' . $filter_type . '</option>';
 				}
 
 				return 'Show: <select id="dbg_filter" onchange="$Debugger.Filter()"><option value="">All</option>' . $filter_options .'</select>';
 			}
 
 			function getMemoryUsed($debugger_start)
 			{
 				if ( !isset($this->ProfilerTotals['error_handling']) ) {
 					$memory_used = $debugger_start;
 					$this->ProfilerTotalCount['error_handling'] = 0;
 				}
 				else {
 					$memory_used = $debugger_start - $this->ProfilerTotals['error_handling'];
 				}
 
 				return $memory_used;
 			}
 
 			/**
 			 * Format's memory usage report by debugger
 			 *
 			 * @param int $memory_used
 			 * @return string
 			 * @access private
 			 */
 			private function getShortReport($memory_used)
 			{
 				if ( DebuggerUtil::constOn('DBG_TOOLBAR_BUTTONS') ) {
 					// evenrything is in toolbar - don't duplicate
 					return '';
 				}
 				else {
 					// toolbar not visible, then show sql & error count too
 					$info = Array (
 						'Script Runtime'	=>	'PROFILE:script_runtime',
 						'SQL\'s Runtime'	=>	'PROFILE_T:sql',
 						'-'					=>	'SEP:-',
 						'Notice / Warning'	=>	'PROFILE_TC:error_handling',
 						'SQLs Count'		=>	'PROFILE_TC:sql',
 					);
 				}
 
 				$ret = ''; // '<tr><td>Application:</td><td><b>' . DebuggerUtil::formatSize($memory_used) . '</b> (' . $memory_used . ')</td></tr>';
 
 				foreach ($info as $title => $value_key) {
 					list ($record_type, $record_data) = explode(':', $value_key, 2);
 					switch ( $record_type ) {
 						case 'PROFILE': // profiler totals value
 							$Data =& $this->ProfilerData[$record_data];
 							$profile_time = ($Data['ends'] - $Data['begins']); // in seconds
 							$ret .= '<tr><td>' . $title . ':</td><td><b>' . sprintf('%.5f', $profile_time) . ' s</b></td></tr>';
 							break;
 
 						case 'PROFILE_TC': // profile totals record count
 							$record_cell = '<td>';
 							if ( $record_data == 'error_handling' && $this->ProfilerTotalCount[$record_data] > 0 ) {
 								$record_cell = '<td class="debug_error">';
 							}
 							$ret .= '<tr>' . $record_cell . $title . ':</td>' . $record_cell . '<b>' . $this->ProfilerTotalCount[$record_data] . '</b></td></tr>';
 							break;
 
 						case 'PROFILE_T': // profile total
 							$record_cell = '<td>';
 							$total = array_key_exists($record_data, $this->ProfilerTotals) ? $this->ProfilerTotals[$record_data] : 0;
 							$ret .= '<tr>' . $record_cell . $title . ':</td>' . $record_cell . '<b>' . sprintf('%.5f', $total) . ' s</b></td></tr>';
 							break;
 
 						case 'SEP':
 							$ret .= '<tr><td colspan="2" style="height: 1px; background-color: #000000; padding: 0px;"><img src="' . $this->dummyImage . '" height="1" alt=""/></td></tr>';
 							break;
 					}
 				}
 
 				return '<br /><table class="dbg_stats_table"><tr><td style="border-color: #FFFFFF;"><table class="dbg_stats_table" align="left">' . $ret . '</table></td></tr></table>';
 			}
 
 			/**
 			 * Detects if there was a fatal error at some point
 			 *
 			 * @return boolean
 			 */
 			private function _fatalErrorHappened()
 			{
 				return $this->_fatalErrorHash !== 0;
 			}
 
 			/**
 			 * Creates error hash
 			 *
 			 * @param string  $errfile File, where error happened.
 			 * @param integer $errline Line in file, where error happened.
 			 *
 			 * @return integer
 			 */
 			private function _getErrorHash($errfile, $errline)
 			{
 				return crc32($errfile . ':' . $errline);
 			}
 
 			/**
 			 * User-defined error handler
 			 *
 			 * @param integer $errno            Error code.
 			 * @param string  $errstr           Error message.
 			 * @param string  $errfile          Error file.
 			 * @param integer $errline          Error line.
 			 * @param array   $errcontext       Error context.
 			 * @param boolean $is_shutdown_func Called from shutdown function.
 			 *
 			 * @return boolean
 			 * @throws Exception When unknown error code given.
 			 */
 			public function saveError(
 				$errno,
 				$errstr,
 				$errfile = null,
 				$errline = null,
 				array $errcontext = null,
 				$is_shutdown_func = false
 			) {
 				$this->ProfilerData['error_handling']['begins'] = memory_get_usage();
 
 				$errorType = $this->getErrorNameByCode($errno);
 
 				if (!$errorType) {
 					throw new Exception('Unknown error type [' . $errno . ']');
 				}
 				elseif ( substr($errorType, 0, 5) == 'Fatal' ) {
 					$this->_fatalErrorHash = $this->_getErrorHash($errfile, $errline);
 					$this->appendTrace(4);
 				}
 
 				$this->expandError($errstr, $errfile, $errline);
 
 				$this->Data[] = Array (
 					'no' => $errno, 'str' => $errstr, 'file' => $errfile, 'line' => $errline,
 					'context' => $errcontext, 'debug_type' => 'error'
 				);
 
 				$this->ProfilerData['error_handling']['ends'] = memory_get_usage();
 				$this->profilerAddTotal('error_handling', 'error_handling');
 
 				if ($errorType == 'Warning') {
 					$this->WarningCount++;
 				}
 
 				if ( $this->_fatalErrorHappened()
 					&& $this->_getErrorHash($errfile, $errline) === $this->_fatalErrorHash
 				) {
 					// Append debugger report to data in buffer & clean buffer afterwards.
 					echo $this->_breakOutOfBuffering(false) . $this->printReport(true);
 
 					if ( !$is_shutdown_func ) {
 						exit;
 					}
 				}
 
 				return true;
 			}
 
 			/**
 			 * Adds exception details into debugger but don't cause fatal error
 			 *
 			 * @param Exception $exception
 			 * @return void
 			 * @access public
 			 */
 			public function appendException($exception)
 			{
 				$this->ProfilerData['error_handling']['begins'] = memory_get_usage();
 
 				$this->appendExceptionTrace($exception);
 
 				$errno = $exception->getCode();
 				$errstr = $exception->getMessage();
 				$errfile = $exception->getFile();
 				$errline = $exception->getLine();
 
 				$this->expandError($errstr, $errfile, $errline);
 
 				$this->Data[] = Array (
 					'no' => $errno, 'str' => $errstr, 'file' => $errfile, 'line' => $errline,
 					'exception_class' => get_class($exception), 'debug_type' => 'exception'
 				);
 
 				$this->ProfilerData['error_handling']['ends'] = memory_get_usage();
 				$this->profilerAddTotal('error_handling', 'error_handling');
 			}
 
 			/**
 			 * User-defined exception handler
 			 *
 			 * @param Exception $exception
 			 * @return void
 			 * @access public
 			 */
 			public function saveException($exception)
 			{
 				$this->appendException($exception);
 				$this->_fatalErrorHash = $this->_getErrorHash($exception->getFile(), $exception->getLine());
 
 				// Append debugger report to data in buffer & clean buffer afterwards.
 				echo $this->_breakOutOfBuffering(false) . $this->printReport(true);
 			}
 
 			/**
 			 * Transforms short error messages into long ones
 			 *
 			 * @param string $errstr
 			 * @param string $errfile
 			 * @param int $errline
 			 * @return void
 			 * @access private
 			 */
 			private function expandError(&$errstr, &$errfile, &$errline)
 			{
 				$errstr = kLogger::expandMessage($errstr);
 				list ($errno, $errstr, $sql) = kLogger::parseDatabaseError($errstr);
 
 				if ( $errno != 0 ) {
 					$errstr = '<span class="debug_error">' . $errstr . ' (' . $errno . ')</span><br/><strong>SQL</strong>: ' . $this->formatSQL($sql);
 				}
 
 				if ( strpos($errfile, 'eval()\'d code') !== false ) {
 					$errstr = '[<b>EVAL</b>, line <b>' . $errline . '</b>]: ' . $errstr;
 					$tmpStr = $errfile;
 					$pos = strpos($tmpStr, '(');
 					$errfile = substr($tmpStr, 0, $pos);
 					$pos++;
 					$errline = substr($tmpStr, $pos, strpos($tmpStr, ')', $pos) - $pos);
 				}
 			}
 
 			/**
 			 * Break buffering in case if fatal error is happened in the middle
 			 *
 			 * @param bool $flush
 			 * @return string
 			 * @access private
 			 */
 			private function _breakOutOfBuffering($flush = true)
 			{
 				$buffer_content = Array ();
 				while ( ob_get_level() ) {
 					$buffer_content[] = ob_get_clean();
 				}
 
 				$ret = implode('', array_reverse($buffer_content));
 				if ( $flush ) {
 					echo $ret;
 					flush();
 				}
 
 				return $ret;
 			}
 
 			/**
 			 * Saves given message to "vb_debug.txt" file in DocumentRoot
 			 *
 			 * @param string $msg
 			 * @return void
 			 * @access public
 			 */
 			public function saveToFile($msg)
 			{
 				$fp = fopen($_SERVER['DOCUMENT_ROOT'] . '/vb_debug.txt', 'a');
 				fwrite($fp, $msg . "\n");
 				fclose($fp);
 			}
 
 			/**
 			 * Prints given constant values in a table
 			 *
 			 * @param mixed $constants
 			 * @return void
 			 * @access public
 			 */
 			public function printConstants($constants)
 			{
 				if ( !is_array($constants) ) {
 					$constants = explode(',', $constants);
 				}
 
 				$constant_tpl = '<tr><td>%s</td><td><b>%s</b></td></tr>';
 				$ret = '<table class="dbg_flat_table" style="width: ' . $this->getWindowWidth() . 'px;">';
 
 				foreach ($constants as $constant_name) {
 					$ret .= sprintf($constant_tpl, $constant_name, constant($constant_name));
 				}
 
 				$ret .= '</table>';
 				$this->appendHTML($ret);
 			}
 
 			/**
 			 * Attaches debugger to Application
 			 *
 			 * @return void
 			 * @access public
 			 */
 			public function AttachToApplication()
 			{
 				if ( !DebuggerUtil::constOn('DBG_HANDLE_ERRORS') ) {
 					return;
 				}
 
 				if ( class_exists('kApplication') ) {
 					$this->Application =& kApplication::Instance();
 					$this->Application->Debugger = $this;
 				}
 
 				// kLogger will auto-detect these automatically
 				// error/exception handlers registered before debugger will be removed!
 				set_error_handler( Array ($this, 'saveError') );
 				set_exception_handler( Array ($this, 'saveException') );
 			}
 
 			/**
 			 * Returns HTML for tools section
 			 *
 			 * @return string
 			 * @access private
 			 */
 			private function _getToolsHTML()
 			{
 				$html = '<table>
 							<tr>
 								<td>System Tools:</td>
 								<td>
 									<select id="reset_cache" style="border: 1px solid #000000;">
 										<option value=""></option>
 										<option value="events[adm][OnResetModRwCache]">Reset mod_rewrite Cache</option>
 										<option value="events[adm][OnResetCMSMenuCache]">Reset SMS Menu Cache</option>
 										<option value="events[adm][OnResetSections]">Reset Sections Cache</option>
 										<option value="events[adm][OnResetConfigsCache]">Reset Configs Cache</option>
 										<option value="events[adm][OnRebuildThemes]">Re-build Themes Files</option>
 										<option value="events[lang][OnReflectMultiLingualFields]">Re-build Multilanguage Fields</option>
 										<option value="events[adm][OnDeleteCompiledTemplates]">Delete Compiled Templates</option>
 									</select>
 								</td>
 								<td>
 									<input type="button" class="button" onclick="$Debugger.resetCache(\'reset_cache\');" value="Go"/>
 								</td>
 							</tr>
 						</table>';
 
 				return $html;
 			}
 
 			/**
 			 * Returns HTML for dom viewer section
 			 *
 			 * @return string
 			 * @access private
 			 */
 			private function _getDomViewerHTML()
 			{
 				$html = '<table>
 							<tr>
 								<td>
 									<a href="http://www.brainjar.com/dhtml/domviewer/" target="_blank">DomViewer</a>:
 								</td>
 								<td>
 									 <input id="dbg_domviewer" type="text" value="window" style="border: 1px solid #000000;"/>
 								</td>
 								<td>
 									<button class="button" onclick="return $Debugger.OpenDOMViewer();">Show</button>
 								</td>
 							</tr>
 						</table>';
 
 				return $html;
 			}
 		}
 
 		if ( !function_exists('memory_get_usage') ) {
 			// PHP 4.x and compiled without --enable-memory-limit option
 			function memory_get_usage()
 			{
 				return -1;
 			}
 		}
 
 		if ( !DebuggerUtil::constOn('DBG_ZEND_PRESENT') ) {
 			$debugger = new Debugger();
 		}
 
 		if ( DebuggerUtil::constOn('DBG_USE_SHUTDOWN_FUNC') ) {
 			register_shutdown_function(array(&$debugger, 'printReport'), false, true, true);
 		}
 	}
Index: branches/5.3.x/core/kernel/utility/email.php
===================================================================
--- branches/5.3.x/core/kernel/utility/email.php	(revision 16518)
+++ branches/5.3.x/core/kernel/utility/email.php	(revision 16519)
@@ -1,971 +1,971 @@
 <?php
 /**
  * @version	$Id$
  * @package	In-Portal
  * @copyright	Copyright (C) 1997 - 2012 Intechnic. All rights reserved.
  * @license	  GNU/GPL
  * In-Portal is Open Source software.
  * This means that this software may have been modified pursuant
  * the GNU General Public License, and as distributed it includes
  * or is derivative of works licensed under the GNU General Public License
  * or other free or open source software licenses.
  * See http://www.in-portal.org/license for copyright notices and details.
  */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class kEmail extends kBase {
 
 	/**
 	 * Reference to class, that could send out e-mail
 	 *
 	 * @var kEmailSendingHelper
 	 * @access protected
 	 */
 	protected $sender = null;
 
 	/**
 	 * Parameters of e-mail
 	 *
 	 * @var Array
 	 * @access protected
 	 * @see kEmail::_getCustomParams() List of possible system parameters supported
 	 */
 	protected $params = Array ();
 
 	/**
 	 * Reference to e-mail template object, that would be used as data source
 	 *
 	 * @var kDBItem
 	 */
 	protected $emailTemplate = null;
 
 	/**
 	 * Sender name
 	 *
 	 * @var string
 	 * @access protected
 	 */
 	protected $fromName = '';
 
 	/**
 	 * Sender e-mail
 	 *
 	 * @var string
 	 * @access protected
 	 */
 	protected $fromEmail = '';
 
 	/**
 	 * Recipient name
 	 *
 	 * @var string
 	 * @access protected
 	 */
 	protected $toName = '';
 
 	/**
 	 * Recipient e-mail
 	 *
 	 * @var string
 	 * @access protected
 	 */
 	protected $toEmail = '';
 
 	/**
 	 * ID of recipient user
 	 *
 	 * @var int
 	 */
 	protected $recipientUserId = null;
 
 	/**
 	 * List of e-mail recipients
 	 *
 	 * @var Array
 	 * @access protected
 	 */
 	protected $recipients = Array (
 		EmailTemplate::RECIPIENT_TYPE_TO => Array (),
 		EmailTemplate::RECIPIENT_TYPE_CC => Array (),
 		EmailTemplate::RECIPIENT_TYPE_BCC => Array (),
 	);
 
 	/**
 	 * Stores log data.
 	 *
 	 * @var array
 	 */
 	protected $logData = array();
 
 	/**
 	 * Creates e-mail instance
 	 */
 	public function __construct()
 	{
 		parent::__construct();
 
 		$this->sender = $this->Application->recallObject('EmailSender');
 	}
 
 	/**
 	 * Resets state of e-mail
 	 *
 	 * @return void
 	 * @access protected
 	 */
 	protected function _resetState()
 	{
 		$this->logData = array();
 
 		$this->fromEmail = $this->fromName = '';
 		$this->Application->removeObject('u.email-from');
 
 		$this->recipients = Array (
 			EmailTemplate::RECIPIENT_TYPE_TO => Array (),
 			EmailTemplate::RECIPIENT_TYPE_CC => Array (),
 			EmailTemplate::RECIPIENT_TYPE_BCC => Array (),
 		);
 
 		$this->toEmail = $this->toEmail = '';
 		$this->Application->removeObject('u.email-to');
 	}
 
 	/**
 	 * Finds e-mail template matching user data
 	 *
 	 * @param string $name
 	 * @param int $type
 	 * @return bool
 	 * @throws InvalidArgumentException
 	 * @access public
 	 */
 	public function findTemplate($name, $type)
 	{
 		if ( !$name || !preg_match('/^[A-Z\.]+$/', $name) ) {
 			throw new InvalidArgumentException('Invalid e-mail template name "<strong>' . $name . '</strong>". Only <strong>UPPERCASE characters</strong> and <strong>dots</strong> are allowed.');
 		}
 
 		if ( $type != EmailTemplate::TEMPLATE_TYPE_ADMIN && $type != EmailTemplate::TEMPLATE_TYPE_FRONTEND ) {
 			throw new InvalidArgumentException('Invalid e-mail template type');
 		}
 
 		// use "-item" special prevent error, when e-mail sent out from e-mail templates list
 		$this->emailTemplate = $this->Application->recallObject('email-template.-item', null, Array ('skip_autoload' => true));
 
 		if ( !$this->emailTemplate->isLoaded() || !$this->_sameTemplate($name, $type) ) {
 			// get template parameters by name & type
 			$this->emailTemplate->Load(Array ('TemplateName' => $name, 'Type' => $type));
 		}
 
 		return $this->_templateUsable();
 	}
 
 	/**
 	 * Detects, that given e-mail template data matches currently used e-mail template
 	 *
 	 * @param string $name
 	 * @param int $type
 	 * @return bool
 	 * @access protected
 	 */
 	protected function _sameTemplate($name, $type)
 	{
 		return $this->emailTemplate->GetDBField('TemplateName') == $name && $this->emailTemplate->GetDBField('Type') == $type;
 	}
 
 	/**
 	 * Determines if we can use e-mail template we've found based on user data
 	 *
 	 * @return bool
 	 * @access protected
 	 */
 	protected function _templateUsable()
 	{
 		if ( !$this->emailTemplate->isLoaded() || $this->emailTemplate->GetDBField('Enabled') == STATUS_DISABLED ) {
 			return false;
 		}
 
 		if ( $this->emailTemplate->GetDBField('FrontEndOnly') && $this->Application->isAdmin ) {
 			return false;
 		}
 
 		return true;
 	}
 
 	/**
 	 * Sets e-mail template params
 	 *
 	 * @param Array $params
 	 * @access public
 	 */
 	public function setParams($params)
 	{
 		$this->params = $params;
 	}
 
 	/**
 	 * Returns any custom parameters, that are passed when invoked e-mail template sending
 	 *
 	 * @return Array
 	 * @access protected
 	 */
 	protected function _getCustomParams()
 	{
 		$ret = $this->params;
 		$send_keys = Array (
 			'from_email', 'from_name', 'to_email', 'to_name',
 			'overwrite_to_email', 'language_id', 'use_custom_design', 'delivery',
 			'PrefixSpecial', 'item_id',
 		);
 
 		foreach ($send_keys as $send_key) {
 			unset($ret[$send_key]);
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Sends e-mail now or puts it in queue
 	 *
 	 * @param int $recipient_user_id
 	 * @return bool
 	 * @access public
 	 */
 	public function send($recipient_user_id = null)
 	{
 		$this->recipientUserId = $recipient_user_id;
 
 		$this->_resetState();
 		$this->_processSender();
 		$this->_processRecipients();
 		$this->_changeLanguage(false);
 
 		// 1. set headers
 		try {
 			$message_headers = $this->_getHeaders();
 		}
 		catch ( Exception $e ) {
 			return $this->setError('Error parsing e-mail message headers');
 		}
 
 		$message_subject = isset($message_headers['Subject']) ? $message_headers['Subject'] : 'Mail message';
 		$this->sender->SetSubject($message_subject);
 
 		foreach ( $message_headers as $header_name => $header_value ) {
 			$this->sender->SetEncodedHeader($header_name, $header_value);
 		}
 
 		if ( $this->_storeEmailLog() ) {
 			// 1. prepare log
 			$this->logData = Array (
 				'From' => $this->fromName . ' (' . $this->fromEmail . ')',
 				'To' => $this->toName . ' (' . $this->toEmail . ')',
 				'OtherRecipients' => serialize($this->recipients),
 				'Subject' => $message_subject,
 				'Status' => EmailLogStatus::SENT,
 				'ErrorMessage' => '',
 				'SentOn' => TIMENOW,
 				'TemplateName' => $this->emailTemplate->GetDBField('TemplateName'),
 				'EventType' => $this->emailTemplate->GetDBField('Type'),
 				'EventParams' => serialize($this->_getCustomParams()),
 				'ToUserId' => $this->recipientUserId,
 				'ItemPrefix' => $this->getItemPrefix(),
 				'ItemId' =>  isset($this->params['item_id']) ? $this->params['item_id'] : null,
 			);
 
 			$this->params['email_access_key'] = $this->_generateAccessKey();
 		}
 
 		// 3. set body
 		try {
 			$html_message_body = $this->_getMessageBody(true);
 			$plain_message_body = $this->_getMessageBody(false);
 		}
 		catch ( Exception $e ) {
 			return $this->setError('Error parsing e-mail message body');
 		}
 
 		if ( $html_message_body === false && $plain_message_body === false ) {
 			return $this->setError('Message template is empty (maybe after parsing).');
 		}
 
 		if ( $html_message_body !== false ) {
 			$this->sender->CreateTextHtmlPart($html_message_body, true);
 		}
 
 		if ( $plain_message_body !== false ) {
 			$this->sender->CreateTextHtmlPart($plain_message_body, false);
 		}
 
 		$this->_changeLanguage(true);
 
 		if ( $this->_storeEmailLog() ) {
 			// 4. set log
 			$this->logData['HtmlBody'] = $html_message_body;
 			$this->logData['TextBody'] = $plain_message_body;
 			$this->logData['AccessKey'] = $this->params['email_access_key'];
 			$this->sender->setLogData($this->logData);
 		}
 
 		$delivery = isset($this->params['delivery']) ? $this->params['delivery'] : $this->Application->ConfigValue('EmailDelivery');
 
 		return $this->sender->Deliver(null, $delivery == EmailDelivery::IMMEDIATE);
 	}
 
 	/**
 	 * Extracts prefix from a given PrefixSpecial parameter.
 	 *
 	 * @return string
 	 */
 	protected function getItemPrefix()
 	{
 		$prefix_special = isset($this->params['PrefixSpecial']) ? $this->params['PrefixSpecial'] : '';
 
 		if ( !$prefix_special ) {
 			return '';
 		}
 
 		$prefix_info = $this->Application->processPrefix($prefix_special);
 
 		return $prefix_info['prefix'];
 	}
 
 	/**
 	 * Determines whatever we should keep e-mail log or not
 	 *
 	 * @return bool
 	 * @access protected
 	 */
 	protected function _storeEmailLog()
 	{
 		return $this->Application->ConfigValue('EnableEmailLog');
 	}
 
 	/**
 	 * Marks e-mail sending as failed.
 	 *
 	 * @param string $error_message Error message.
 	 *
 	 * @return boolean
 	 */
 	protected function setError($error_message)
 	{
 		if ( $this->_storeEmailLog() ) {
 			$this->logData['Status'] = EmailLogStatus::ERROR;
 			$this->logData['ErrorMessage'] = $error_message;
 			$this->Conn->doInsert($this->logData, TABLE_PREFIX . 'EmailLog');
 		}
 
 		return false;
 	}
 
 	/**
 	 * Generates access key for accessing e-mail later
 	 *
 	 * @return string
 	 * @access protected
 	 */
 	protected function _generateAccessKey()
 	{
 		$ret = '';
 		$use_fields = Array ('From', 'To', 'Subject');
 
 		foreach ($use_fields as $use_field) {
 			$ret .= $this->logData[$use_field] . ':';
 		}
 
 		return md5($ret . microtime(true));
 	}
 
 	/**
 	 * Processes email sender
 	 *
 	 * @return void
 	 * @access protected
 	 */
 	protected function _processSender()
 	{
 		if ( $this->emailTemplate->GetDBField('CustomSender') ) {
 			$this->_processCustomSender();
 		}
 
 		// update with custom data given during event execution
 		if ( isset($this->params['from_email']) ) {
 			$this->fromEmail = $this->params['from_email'];
 		}
 
 		if ( isset($this->params['from_name']) ) {
 			$this->fromName = $this->params['from_name'];
 		}
 
 		// still nothing, set defaults
 		$this->_ensureDefaultSender();
 		$this->sender->SetFrom($this->fromEmail, $this->fromName);
 	}
 
 	/**
 	 * Processes custom e-mail sender
 	 *
 	 * @return void
 	 * @access protected
 	 */
 	protected function _processCustomSender()
 	{
 		$address = $this->emailTemplate->GetDBField('SenderAddress');
 		$address_type = $this->emailTemplate->GetDBField('SenderAddressType');
 
 		switch ($address_type) {
 			case EmailTemplate::ADDRESS_TYPE_EMAIL:
 				$this->fromEmail = $address;
 				break;
 
 			case EmailTemplate::ADDRESS_TYPE_USER:
 				$sql = 'SELECT FirstName, LastName, Email, PortalUserId
 						FROM ' . TABLE_PREFIX . 'Users
 						WHERE Username = ' . $this->Conn->qstr($address);
 				$user_info = $this->Conn->GetRow($sql);
 
 				if ( $user_info ) {
 					// user still exists
 					$this->fromEmail = $user_info['Email'];
 					$this->fromName = trim($user_info['FirstName'] . ' ' . $user_info['LastName']);
 
+					/** @var UsersItem $user */
 					$user = $this->Application->recallObject(
 						'u.email-from',
 						null,
 						array('live_table' => true, 'skip_autoload' => true)
 					);
-					/* @var $user UsersItem */
 
 					$user->Load($user_info['PortalUserId']);
 				}
 				break;
 		}
 
 		if ( $this->emailTemplate->GetDBField('SenderName') ) {
 			$this->fromName = $this->emailTemplate->GetDBField('SenderName');
 		}
 	}
 
 	/**
 	 * Ensures, that sender name & e-mail are not empty
 	 *
 	 * @return void
 	 * @access protected
 	 */
 	protected function _ensureDefaultSender()
 	{
 		if ( !$this->fromEmail ) {
 			$this->fromEmail = $this->Application->ConfigValue('DefaultEmailSender');
 		}
 
 		if ( !$this->fromName ) {
 			$this->fromName = strip_tags($this->Application->ConfigValue('Site_Name'));
 		}
 	}
 
 	/**
 	 * Processes email recipients
 	 *
 	 * @return void
 	 * @access protected
 	 */
 	protected function _processRecipients()
 	{
 		$this->_collectRecipients();
 
 		$header_mapping = $this->getHeaderMapping();
 
 		$default_email = $this->Application->ConfigValue('DefaultEmailSender');
 		$this->recipients = array_map(Array ($this, '_transformRecipientsIntoPairs'), $this->recipients);
 
 		foreach ($this->recipients as $recipient_type => $recipients) {
 			// add recipients to email
 			if ( !$recipients ) {
 				continue;
 			}
 
 			if ( $recipient_type == EmailTemplate::RECIPIENT_TYPE_TO ) {
 				$this->toEmail = $recipients[0]['email'] ? $recipients[0]['email'] : $default_email;
 				$this->toName = $recipients[0]['name'] ? $recipients[0]['name'] : $this->toEmail;
 			}
 
 			$header_name = $header_mapping[$recipient_type];
 
 			foreach ($recipients as $recipient) {
 				$email = $recipient['email'] ? $recipient['email'] : $default_email;
 				$name = $recipient['name'] ? $recipient['name'] : $email;
 
 				$this->sender->AddRecipient($header_name, $email, $name);
 			}
 		}
 	}
 
 	/**
 	 * Collects e-mail recipients from various sources
 	 *
 	 * @return void
 	 * @access protected
 	 */
 	protected function _collectRecipients()
 	{
 		$this->_addRecipientsFromXml($this->emailTemplate->GetDBField('Recipients'));
 		$this->_overwriteToRecipient();
 		$this->_addRecipientByUserId();
 		$this->_addRecipientFromParams();
 		$this->_moveDirectRecipients();
 
 		if ( ($this->emailTemplate->GetDBField('Type') == EmailTemplate::TEMPLATE_TYPE_ADMIN) && !$this->recipients[EmailTemplate::RECIPIENT_TYPE_TO] ) {
 			// admin email template without direct recipient -> send to admin
 			$this->_addDefaultRecipient();
 		}
 	}
 
 	/**
 	 * Adds multiple recipients from an XML
 	 *
 	 * @param string $xml
 	 * @return bool
 	 * @access protected
 	 */
 	protected function _addRecipientsFromXml($xml)
 	{
 		if ( !$xml ) {
 			return false;
 		}
 
+		/** @var MInputHelper $minput_helper */
 		$minput_helper = $this->Application->recallObject('MInputHelper');
-		/* @var $minput_helper MInputHelper */
 
 		// group recipients by type
 		$records = $minput_helper->parseMInputXML($xml);
 
 		foreach ($records as $record) {
 			$this->recipients[$record['RecipientType']][] = $record;
 		}
 
 		return true;
 	}
 
 	/**
 	 * Remove all "To" recipients, when not allowed
 	 *
 	 * @return void
 	 * @access protected
 	 */
 	protected function _overwriteToRecipient()
 	{
 		$overwrite_to_email = isset($this->params['overwrite_to_email']) ? $this->params['overwrite_to_email'] : false;
 
 		if ( !$this->emailTemplate->GetDBField('CustomRecipient') || $overwrite_to_email ) {
 			$this->recipients[EmailTemplate::RECIPIENT_TYPE_TO] = Array ();
 		}
 	}
 
 	/**
 	 * Update with custom data given during event execution (user_id)
 	 *
 	 * @return void
 	 * @access protected
 	 */
 	protected function _addRecipientByUserId()
 	{
 		if ( !is_numeric($this->recipientUserId) ) {
 			return;
 		}
 
 		if ( $this->recipientUserId <= 0 ) {
 			// recipient is system user with negative ID (root, guest, etc.) -> send to admin
 			$this->_addDefaultRecipient();
 
 			return;
 		}
 
 		$language_field = $this->emailTemplate->GetDBField('Type') == EmailTemplate::TEMPLATE_TYPE_FRONTEND ? 'FrontLanguage' : 'AdminLanguage';
 
 		$sql = 'SELECT FirstName, LastName, Email, ' . $language_field . ' AS Language
 				FROM ' . TABLE_PREFIX . 'Users
 				WHERE PortalUserId = ' . $this->recipientUserId;
 		$user_info = $this->Conn->GetRow($sql);
 
 		if ( !$user_info ) {
 			return;
 		}
 
 		$add_recipient = Array (
 			'RecipientAddressType' => EmailTemplate::ADDRESS_TYPE_EMAIL,
 			'RecipientAddress' => $user_info['Email'],
 			'RecipientName' => trim($user_info['FirstName'] . ' ' . $user_info['LastName']),
 		);
 
 		if ( $user_info['Language'] && !isset($this->params['language_id']) ) {
 			$this->params['language_id'] = $user_info['Language'];
 		}
 
 		array_unshift($this->recipients[EmailTemplate::RECIPIENT_TYPE_TO], $add_recipient);
 
+		/** @var UsersItem $user */
 		$user = $this->Application->recallObject(
 			'u.email-to',
 			null,
 			array('live_table' => true, 'skip_autoload' => true)
 		);
-		/* @var $user UsersItem */
 
 		$user->Load($this->recipientUserId);
 	}
 
 	/**
 	 * Update with custom data given during event execution (email + name)
 	 *
 	 * @return void
 	 * @access protected
 	 */
 	protected function _addRecipientFromParams()
 	{
 		$add_recipient = Array ();
 
 		if ( isset($this->params['to_email']) && $this->params['to_email'] ) {
 			$add_recipient['RecipientName'] = '';
 			$add_recipient['RecipientAddressType'] = EmailTemplate::ADDRESS_TYPE_EMAIL;
 			$add_recipient['RecipientAddress'] = $this->params['to_email'];
 		}
 
 		if ( isset($this->params['to_name']) && $this->params['to_name'] ) {
 			$add_recipient['RecipientName'] = $this->params['to_name'];
 		}
 
 		if ( $add_recipient ) {
 			array_unshift($this->recipients[EmailTemplate::RECIPIENT_TYPE_TO], $add_recipient);
 		}
 	}
 
 	/**
 	 * Move recipients, that were added manually via "$this->sender->Add*" methods.
 	 *
 	 * @return void
 	 * @access protected
 	 */
 	protected function _moveDirectRecipients()
 	{
 		foreach ( $this->getHeaderMapping() as $recipient_type => $header_name ) {
 			$manual_recipients = $this->sender->GetRecipientsByHeader($header_name);
 
 			if ( !$manual_recipients ) {
 				continue;
 			}
 
 			foreach ( $manual_recipients as $manual_recipient ) {
 				$this->recipients[$recipient_type][] = array(
 					'RecipientName' => $manual_recipient['Name'],
 					'RecipientAddressType' => EmailTemplate::ADDRESS_TYPE_EMAIL,
 					'RecipientAddress' => $manual_recipient['Email'],
 				);
 			}
 
 			$this->sender->SetHeader($header_name, '');
 		}
 	}
 
 	/**
 	 * Returns mapping between recipient type and header name.
 	 *
 	 * @return array
 	 */
 	protected function getHeaderMapping()
 	{
 		return array(
 			EmailTemplate::RECIPIENT_TYPE_TO => 'To',
 			EmailTemplate::RECIPIENT_TYPE_CC => 'Cc',
 			EmailTemplate::RECIPIENT_TYPE_BCC => 'Bcc',
 		);
 	}
 
 	/**
 	 * This is default recipient, when we can't determine actual one
 	 *
 	 * @return void
 	 * @access protected
 	 */
 	protected function _addDefaultRecipient()
 	{
 		$xml = $this->Application->ConfigValue('DefaultEmailRecipients');
 
 		if ( !$this->_addRecipientsFromXml($xml) ) {
 			$recipient = Array (
 				'RecipientName' => $this->Application->ConfigValue('DefaultEmailSender'),
 				'RecipientAddressType' => EmailTemplate::ADDRESS_TYPE_EMAIL,
 				'RecipientAddress' => $this->Application->ConfigValue('DefaultEmailSender'),
 			);
 
 			array_unshift($this->recipients[EmailTemplate::RECIPIENT_TYPE_TO], $recipient);
 		}
 	}
 
 	/**
 	 * Transforms recipients into name/e-mail pairs
 	 *
 	 * @param Array $recipients
 	 * @return Array
 	 * @access protected
 	 */
 	protected function _transformRecipientsIntoPairs($recipients)
 	{
 		if ( !$recipients ) {
 			return Array ();
 		}
 
 		$pairs = Array ();
 
 		foreach ($recipients as $recipient) {
 			$address = $recipient['RecipientAddress'];
 			$address_type = $recipient['RecipientAddressType'];
 			$recipient_name = $recipient['RecipientName'];
 
 			switch ($address_type) {
 				case EmailTemplate::ADDRESS_TYPE_EMAIL:
 					$pairs[] = Array ('email' => $address, 'name' => $recipient_name);
 					break;
 
 				case EmailTemplate::ADDRESS_TYPE_USER:
 					$sql = 'SELECT FirstName, LastName, Email
 							FROM ' . TABLE_PREFIX . 'Users
 							WHERE Username = ' . $this->Conn->qstr($address);
 					$user_info = $this->Conn->GetRow($sql);
 
 					if ( $user_info ) {
 						// user still exists
 						$name = trim($user_info['FirstName'] . ' ' . $user_info['LastName']);
 
 						$pairs[] = Array (
 							'email' => $user_info['Email'],
 							'name' => $name ? $name : $recipient_name,
 						);
 					}
 					break;
 
 				case EmailTemplate::ADDRESS_TYPE_GROUP:
 					$sql = 'SELECT u.FirstName, u.LastName, u.Email
 							FROM ' . TABLE_PREFIX . 'UserGroups g
 							JOIN ' . TABLE_PREFIX . 'UserGroupRelations ug ON ug.GroupId = g.GroupId
 							JOIN ' . TABLE_PREFIX . 'Users u ON u.PortalUserId = ug.PortalUserId
 							WHERE g.Name = ' . $this->Conn->qstr($address);
 					$users = $this->Conn->Query($sql);
 
 					foreach ($users as $user_info) {
 						$name = trim($user_info['FirstName'] . ' ' . $user_info['LastName']);
 
 						$pairs[] = Array (
 							'email' => $user_info['Email'],
 							'name' => $name ? $name : $recipient_name,
 						);
 					}
 					break;
 			}
 		}
 
 		return $pairs;
 	}
 	/**
 	 * Change system language temporarily to send e-mail on user language
 	 *
 	 * @param bool $restore
 	 * @return void
 	 * @access protected
 	 */
 	protected function _changeLanguage($restore = false)
 	{
 		static $prev_language_id = null;
 
 		if ( !isset($prev_language_id) ) {
 			$prev_language_id = $this->Application->GetVar('m_lang');
 		}
 
 		// ensure that language is set
 		if ( !isset($this->params['language_id']) ) {
 			$this->params['language_id'] = $this->Application->GetVar('m_lang');
 		}
 
 		$language_id = $restore ? $prev_language_id : $this->params['language_id'];
 		$this->Application->SetVar('m_lang', $language_id);
 
+		/** @var LanguagesItem $language */
 		$language = $this->Application->recallObject('lang.current');
-		/* @var $language LanguagesItem */
 
 		$language->Load($language_id);
 
 		$this->Application->Phrases->LanguageId = $language_id;
 		$this->Application->Phrases->Phrases = Array ();
 	}
 
 	/**
 	 * Parses message headers into array
 	 *
 	 * @return Array
 	 * @access protected
 	 */
 	protected function _getHeaders()
 	{
 		$headers = $this->emailTemplate->GetDBField('Headers');
 		$headers = 'Subject: ' . $this->emailTemplate->GetField('Subject') . ($headers ? "\n" . $headers : '');
 		$headers = explode("\n", $this->_parseText($headers));
 
 		$ret = Array ();
 
 		foreach ($headers as $header) {
 			$header = explode(':', $header, 2);
 			$ret[ trim($header[0]) ] = trim($header[1]);
 		}
 
 		if ( $this->Application->isDebugMode() ) {
 			// set special header with template name, so it will be easier to determine what's actually was received
 			$template_type = $this->emailTemplate->GetDBField('Type') == EmailTemplate::TEMPLATE_TYPE_ADMIN ? 'ADMIN' : 'USER';
 			$ret['X-Template-Name'] = $this->emailTemplate->GetDBField('TemplateName') . ' - ' . $template_type;
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Applies design to given e-mail text
 	 *
 	 * @param string $text
 	 * @param bool $is_html
 	 * @return string
 	 * @access protected
 	 */
 	protected function _applyMessageDesign($text, $is_html = true)
 	{
 		static $design_templates = Array();
 
 		$design_key = 'L' . $this->params['language_id'] . ':' . ($is_html ? 'html' : 'text');
 
 		if ( !isset($design_templates[$design_key]) ) {
+			/** @var LanguagesItem $language */
 			$language = $this->Application->recallObject('lang.current');
-			/* @var $language LanguagesItem */
 
 			$design_template = $language->GetDBField($is_html ? 'HtmlEmailTemplate' : 'TextEmailTemplate');
 
 			if ( !$is_html && !$design_template ) {
 				$design_template = $this->sender->ConvertToText($language->GetDBField('HtmlEmailTemplate'), true);
 			}
 
 			$design_templates[$design_key] = $design_template;
 		}
 
 		return $this->_parseText(str_replace('$body', $text, $design_templates[$design_key]), $is_html);
 	}
 
 	/**
 	 * Returns message body
 	 *
 	 * @param bool $is_html
 	 * @return bool|string
 	 * @access protected
 	 */
 	protected function _getMessageBody($is_html = false)
 	{
 		$message_body = $this->emailTemplate->GetField($is_html ? 'HtmlBody' : 'PlainTextBody');
 
 		if ( !trim($message_body) && !$is_html ) {
 			// no plain text part available -> make it from html part then
 			$message_body = $this->sender->ConvertToText($this->emailTemplate->GetField('HtmlBody'), true);
 		}
 
 		if ( !trim($message_body) ) {
 			return false;
 		}
 
 		if ( isset($this->params['use_custom_design']) && $this->params['use_custom_design'] ) {
 			$message_body = $this->_parseText($message_body, $is_html);
 		}
 		else {
 			$message_body = $this->_applyMessageDesign($message_body, $is_html);
 		}
 
 		return trim($message_body) ? $message_body : false;
 	}
 
 	/**
 	 * Parse message template and return headers (as array) and message body part
 	 *
 	 * @param string $text
 	 * @param bool $is_html
 	 * @return string
 	 * @access protected
 	 */
 	protected function _parseText($text, $is_html = true)
 	{
 		$text = $this->_substituteReplacementTags($text);
 
 		if ( !$text ) {
 			return '';
 		}
 
 		// init for cases, when e-mail is sent from event before page template rendering
 		$this->Application->InitParser();
 
 		$parser_params = $this->Application->Parser->Params; // backup parser params
 		$this->Application->Parser->SetParams($this->params);
 
 		$template_name = 'et_' . $this->emailTemplate->GetID() . '_' . crc32($text);
 		$text = $this->Application->Parser->Parse($this->_normalizeLineEndings($text), $template_name);
 		$this->Application->Parser->SetParams($parser_params); // restore parser params
 
+		/** @var CategoryHelper $category_helper */
 		$category_helper = $this->Application->recallObject('CategoryHelper');
-		/* @var $category_helper CategoryHelper */
 
 		return $category_helper->replacePageIds($is_html ? $this->_removeTrailingLineEndings($text) : $text);
 	}
 
 	/**
 	 * Substitutes replacement tags in given text
 	 *
 	 * @param string $text
 	 * @return string
 	 * @access protected
 	 */
 	protected function _substituteReplacementTags($text)
 	{
 		$default_replacement_tags = Array (
 			'<inp:touser _Field="password"' => '<inp2:u_Field name="Password_plain"',
 			'<inp:touser _Field="UserName"' => '<inp2:u_Field name="Username"',
 			'<inp:touser _Field' => '<inp2:u_Field name',
 		);
 
 		$replacement_tags = $this->emailTemplate->GetDBField('ReplacementTags');
 		$replacement_tags = $replacement_tags ? unserialize($replacement_tags) : Array ();
 		$replacement_tags = array_merge($default_replacement_tags, $replacement_tags);
 
 		foreach ($replacement_tags as $replace_from => $replace_to) {
 			$text = str_replace($replace_from, $replace_to, $text);
 		}
 
 		return $text;
 	}
 
 	/**
 	 * Convert Unix/Windows/Mac line ending into Unix line endings
 	 *
 	 * @param string $text
 	 * @return string
 	 * @access protected
 	 */
 	protected function _normalizeLineEndings($text)
 	{
 		return str_replace(Array ("\r\n", "\r"), "\n", $text);
 	}
 
 	/**
 	 * Remove trailing line endings
 	 *
 	 * @param $text
 	 * @return string
 	 * @access protected
 	 */
 	protected function _removeTrailingLineEndings($text)
 	{
 		return preg_replace('/(\n|\r)+/', "\\1", $text);
 	}
 }
Index: branches/5.3.x/core/kernel/event_handler.php
===================================================================
--- branches/5.3.x/core/kernel/event_handler.php	(revision 16518)
+++ branches/5.3.x/core/kernel/event_handler.php	(revision 16519)
@@ -1,274 +1,274 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	/**
 	 * Note:
 	 *   1. When addressing variables from submit containing
 	 *	 	Prefix_Special as part of their name use
 	 *	 	$event->getPrefixSpecial(true) instead of
 	 *	 	$event->getPrefixSpecial() as usual. This is due PHP
 	 *	 	is converting "." symbols in variable names during
 	 *	 	submit info "_". $event->getPrefixSpecial optional
 	 *	 	1st parameter returns correct current Prefix_Special
 	 *	 	for variables being submitted such way (e.g. variable
 	 *	 	name that will be converted by PHP: "users.read_only_id"
 	 *	 	will be submitted as "users_read_only_id".
 	 *
 	 *	 2.	When using $this->Application->LinkVar on variables submitted
 	 *		from the form which contains $Prefix_Special then note 1st item.
 	 * 		Example: LinkVar($event->getPrefixSpecial(true).'_varname', $event->getPrefixSpecial().'_varname')
 	 *
 	 */
 
 	/**
 	 * Default event handler. Mostly abstract class
 	 *
 	 */
 	class kEventHandler extends kBase {
 
 		/**
 		 * In case if event should be handled with method, which name differs from
 		 * event name, then it should be specified here.
 		 * key - event name, value - event method
 		 *
 		 * @var Array
 		 * @access protected
 		 */
 		protected $eventMethods = Array ();
 
 		/**
 		 * Defines mapping vs event names and permission names
 		 *
 		 * @var Array
 		 * @access protected
 		 */
 		protected $permMapping = Array ();
 
 		public function __construct()
 		{
 			parent::__construct();
 
 			$this->mapEvents();
 			$this->mapPermissions();
 		}
 
 		/**
 		 * Define alternative event processing method names
 		 *
 		 * @return void
 		 * @see kEventHandler::$eventMethods
 		 * @access protected
 		 */
 		protected function mapEvents()
 		{
 
 		}
 
 		/**
 		 * Allows to override standard permission mapping
 		 *
 		 * @return void
 		 * @access protected
 		 * @see kEventHandler::$permMapping
 		 */
 		protected function mapPermissions()
 		{
 
 		}
 
 		/**
 		 * Returns prefix and special (when present) joined by a "."
 		 *
 		 * @return string
 		 * @access private
 		 */
 		public function getPrefixSpecial()
 		{
 			throw new Exception('Usage of getPrefixSpecial() method is forbidden in kEventHandler class children. Use $event->getPrefixSpecial(true); instead');
 		}
 
 		/**
 		 * Executes event, specified in $event variable
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access public
 		 */
 		public function processEvent(kEvent $event)
 		{
 			$event_name = $this->getEventMethod($event);
 
 			$this->$event_name($event);
 		}
 
 		/**
 		 * Returns method name, that should called to process given event.
 		 * When no such method exists and exception is thrown.
 		 *
 		 * @param kEvent $event
 		 * @return string
 		 * @throws Exception
 		 */
 		public function getEventMethod(kEvent $event)
 		{
 			$event_name = $event->Name;
 
 			if ( array_key_exists($event_name, $this->eventMethods) ) {
 				$event_name = $this->eventMethods[$event_name];
 			}
 
 			if ( method_exists($this, $event_name) ) {
 				return $event_name;
 			}
 			elseif ( $this->getAjaxSubEventName($event) != '' ) {
 				return 'wrapForAjax';
 			}
 
 			throw new Exception('Event "<strong>' . $event->Name . '</strong>" not implemented in class "<strong>' . get_class($this) . '</strong>"');
 		}
 
 		/**
 		 * Automatically wraps events in Ajax calls
 		 *
 		 * @param kEvent $event
 		 *
 		 * @return void
 		 */
 		protected function wrapForAjax(kEvent $event)
 		{
+			/** @var AjaxFormHelper $ajax_form_helper */
 			$ajax_form_helper = $this->Application->recallObject('AjaxFormHelper');
-			/* @var $ajax_form_helper AjaxFormHelper */
 
 			$ajax_form_helper->transitEvent($event, $this->getAjaxSubEventName($event));
 		}
 
 		/**
 		 * Sample dummy event
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBuild(kEvent $event)
 		{
 
 		}
 
 		/**
 		 * Returns to previous template in opener stack
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnGoBack(kEvent $event)
 		{
 			$url = $this->Application->RecallVar('export_finish_url');
 
 			if ( $url ) {
 				$this->Application->Redirect('external:' . $url);
 			}
 
 			$event->SetRedirectParam('opener', 'u');
 		}
 
 		/**
 		 * Apply some special processing to object being
 		 * recalled before using it in other events that
 		 * call prepareObject
 		 *
 		 * @param kDBItem|kDBList $object
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function prepareObject(&$object, kEvent $event)
 		{
 
 		}
 
 		/**
 		 * Checks user permission to execute given $event
 		 *
 		 * @param kEvent $event
 		 * @return bool
 		 * @access public
 		 */
 		public function CheckPermission(kEvent $event)
 		{
+			/** @var kPermissionsHelper $perm_helper */
 			$perm_helper = $this->Application->recallObject('PermissionsHelper');
-			/* @var $perm_helper kPermissionsHelper */
 
 			if ( !isset($this->permMapping[$event->Name]) ) {
 				$ajax_event_name = $this->getAjaxSubEventName($event);
 
 				if ( $ajax_event_name != '' && isset($this->permMapping[$ajax_event_name]) ) {
 					$this->permMapping[$event->Name] = $this->permMapping[$ajax_event_name];
 				}
 			}
 
 			return $perm_helper->CheckEventPermission($event, $this->permMapping);
 		}
 
 		/**
 		 * Returns event name, that can be wrapped in AJAX response.
 		 *
 		 * @param kEvent $event Event.
 		 *
 		 * @return string
 		 */
 		protected function getAjaxSubEventName(kEvent $event)
 		{
 			if ( method_exists($this, $event->Name) ) {
 				return '';
 			}
 
 			if ( preg_match('/(.*)Ajax$/', $event->Name, $regs) && method_exists($this, $regs[1]) ) {
 				return $regs[1];
 			}
 
 			return '';
 		}
 
 
 		/**
 		 * Occurs, when config was parsed, allows to change config data dynamically
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterConfigRead(kEvent $event)
 		{
 
 		}
 
 		/**
 		 * Returns sql query to be used for event subscriber list selection
 		 *
 		 * @param kEvent $event
 		 * @return string
 		 * @access protected
 		 */
 		protected function OnGetEventSubscribersQuery(kEvent $event)
 		{
 			$sql = 'SELECT SubscriberEmail, UserId
 					FROM ' . $this->Application->getUnitConfig('system-event-subscription')->getTableName() . '
 					WHERE (' . implode(') AND (', $event->getEventParam('where_clause')) . ')';
 			$event->setEventParam('sql', $sql);
 		}
 
 	}
\ No newline at end of file
Index: branches/5.3.x/core/kernel/languages/phrases_cache.php
===================================================================
--- branches/5.3.x/core/kernel/languages/phrases_cache.php	(revision 16518)
+++ branches/5.3.x/core/kernel/languages/phrases_cache.php	(revision 16519)
@@ -1,415 +1,415 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class kPhraseCache extends kBase
 {
 
 	var $Phrases = Array();
 	var $Ids = Array();
 	var $OriginalIds = Array(); //for comparing cache
 
 	var $LanguageId = null;
 
 	/**
 	 * Administrator's language, when visiting site (from frame)
 	 *
 	 * @var int
 	 */
 	var $AdminLanguageId = null;
 
 	var $fromTag = false;
 
 	/**
 	 * Allows to edit existing phrases
 	 *
 	 * @var bool
 	 */
 	var $_editExisting = false;
 
 	/**
 	 * Allows to edit missing phrases
 	 *
 	 * @var bool
 	 */
 	var $_editMissing = false;
 
 	/**
 	 * Template, used for phrase adding/editing
 	 *
 	 * @var string
 	 */
 	var $_phraseEditTemplate = 'languages/phrase_edit';
 
 	/**
 	 * Use simplified form for phrase editing
 	 *
 	 * @var bool
 	 */
 	var $_simpleEditingMode = false;
 
 	/**
 	 * HTML tag used to translate phrases
 	 *
 	 * @var string
 	 */
 	var $_translateHtmlTag = 'a';
 
 	/**
 	 * Phrases, that are in cache, but are not in database
 	 *
 	 * @var Array
 	 */
 	var $_missingPhrases = Array ();
 
 	/**
 	 * Mask for editing link
 	 *
 	 * @var string
 	 */
 	var $_editLinkMask = '';
 
 	/**
 	 * Escape phrase name, before placing it in javascript translation link
 	 *
 	 * @var string
 	 */
 	var $_phraseEscapeStrategy = kUtil::ESCAPE_JS;
 
 	/**
 	 * Sets phrase editing mode, that corresponds current editing mode
 	 *
 	 */
 	function setPhraseEditing()
 	{
 		if (!$this->Application->isAdmin && (EDITING_MODE == EDITING_MODE_CONTENT)) {
 			// front-end viewed in content mode
 			$this->_editExisting = $this->_editMissing = true;
 			$this->_simpleEditingMode = !$this->Application->isDebugMode();
 			$this->_translateHtmlTag = 'span';
 		}
 
 		$this->_editLinkMask = $this->getRawEditLink('#LABEL#');
 
 		if (defined('DEBUG_MODE') && DEBUG_MODE && !$this->Application->GetVar('admin')) {
 			// admin and front-end while not viewed using content mode (via admin)
 			$this->_editMissing = defined('DBG_PHRASES') && DBG_PHRASES;
 
 			if (!$this->Application->isAdmin) {
 				$this->_phraseEditTemplate = 'phrases_edit';
 
 				$url_params = Array (
 					'm_opener' => 'd',
 					'phrases_label' => '#LABEL#',
 					'phrases_event' => 'OnPreparePhrase',
 					'next_template' => 'external:' . $_SERVER['REQUEST_URI'],
 					'pass' => 'm,phrases'
 				);
 
 				$this->_phraseEscapeStrategy = kUtil::ESCAPE_URL;
 				$this->_editLinkMask = $this->Application->HREF($this->_phraseEditTemplate, '', $url_params);
 			}
 		}
 	}
 
 	/**
 	 * Returns raw link for given phrase editing.
 	 *
 	 * @param string $label Phrase label.
 	 *
 	 * @return string
 	 */
 	protected function getRawEditLink($label)
 	{
 		$function_params = array(
 			$label,
 			$this->_phraseEditTemplate,
 			array('event' => 'OnPreparePhrase', 'simple_mode' => $this->_simpleEditingMode),
 		);
 
 		return 'javascript:translate_phrase(' . implode(',', array_map('json_encode', $function_params)) . ');';
 	}
 
 	/**
 	 * Returns final link (using mask) for given phrase editing.
 	 *
 	 * @param string $label Phrase label.
 	 *
 	 * @return string
 	 */
 	protected function getEditLink($label)
 	{
 		$escaped_label = kUtil::escape($label, $this->_phraseEscapeStrategy);
 
 		return str_replace('#LABEL#', $escaped_label, $this->_editLinkMask);
 	}
 
 	/**
 	 * Returns HTML code for label editing.
 	 *
 	 * @param string $url  Phrase editing url.
 	 * @param string $text Link text to show (usually label in upper case).
 	 * @param string $alt  Text to display when hovered over the link.
 	 *
 	 * @return string
 	 */
 	protected function getEditHtmlCode($url, $text, $alt)
 	{
 		$url = kUtil::escape($url, kUtil::ESCAPE_HTML);
 		$ret = '<' . $this->_translateHtmlTag . ' href="' . $url . '" name="cms-translate-phrase" title="' .  $alt . '">' . $text . '</' . $this->_translateHtmlTag . '>';
 
 		return $this->fromTag ? $this->escapeTagReserved($ret) : $ret;
 	}
 
 	/**
 	 * Loads phrases from current language
 	 * Method is called manually (not from kFactory class) too
 	 *
 	 * @param string $prefix
 	 * @param string $special
 	 * @param int $language_id
 	 * @param Array $phrase_ids
 	 */
 	public function Init($prefix, $special = '', $language_id = null, $phrase_ids = null)
 	{
 		parent::Init($prefix, $special);
 
 		if (kUtil::constOn('IS_INSTALL')) {
 			$this->LanguageId = 1;
 		}
 		else {
 			if ( !isset($language_id) ) {
 				if ($this->Application->isAdmin) {
 					$language_id = $this->Application->Session->GetField('Language');
 					$this->AdminLanguageId = $language_id; // same languages, when used from Admin Console
 				}
 				else {
 					$language_id = $this->Application->GetVar('m_lang');
 				}
 			}
 
 			$this->LanguageId = $language_id;
 
 			if (!$this->Application->isAdmin && $this->Application->GetVar('admin')) {
+				/** @var Session $admin_session */
 				$admin_session = $this->Application->recallObject('Session.admin');
-				/* @var $admin_session Session */
 
 				$this->AdminLanguageId = $admin_session->GetField('Language');
 			}
 		}
 
 		$this->LoadPhrases($phrase_ids);
 	}
 
 	function LoadPhrases($ids)
 	{
 		if ( !is_array($ids) || !implode('', $ids) ) {
 			return ;
 		}
 
 		$sql = 'SELECT l' . $this->LanguageId . '_Translation AS Translation, l' . $this->LanguageId . '_HintTranslation AS HintTranslation, l' . $this->LanguageId . '_ColumnTranslation AS ColumnTranslation, PhraseKey
 				FROM ' . TABLE_PREFIX . 'LanguageLabels
 				WHERE PhraseId IN (' . implode(',', $ids) . ') AND l' . $this->LanguageId . '_Translation IS NOT NULL';
 		$this->Phrases = $this->Conn->Query($sql, 'PhraseKey');
 
 		$this->Ids = $this->OriginalIds = $ids;
 	}
 
 	function AddCachedPhrase($label, $value, $allow_editing = true)
 	{
 		// uppercase phrase name for cases, when this method is called outside this class
 		$cache_key = ($allow_editing ? '' : 'NE:') . mb_strtoupper($label);
 
 		$this->Phrases[$cache_key] = Array ('Translation' => $value, 'HintTranslation' => $value, 'ColumnTranslation' => $value);
 	}
 
 	function NeedsCacheUpdate()
 	{
 		return is_array($this->Ids) && count($this->Ids) > 0 && $this->Ids != $this->OriginalIds;
 	}
 
 	/**
 	 * Returns translation of given label
 	 *
 	 * @param string $label
 	 * @param bool $allow_editing return translation link, when translation is missing on current language
 	 * @param bool $use_admin use current Admin Console language to translate phrase
 	 * @return string
 	 * @access public
 	 */
 	public function GetPhrase($label, $allow_editing = true, $use_admin = false)
 	{
 		if ( !isset($this->LanguageId) ) {
 			//actually possible when custom field contains references to language labels and its being rebuilt in OnAfterConfigRead
 			//which is triggered by Sections rebuild, which in turn read all the configs and all of that happens BEFORE seeting the language...
 			return 'impossible case';
 		}
 
 		// cut exclamation marks - deprecated form of passing phrase name from templates
 		$label = preg_replace('/^!(.*)!$/', '\\1', $label);
 
 		if ( strlen($label) == 0 ) {
 			return '';
 		}
 
 		$original_label = $label;
 
 		list ($field_prefix, $label) = $this->parseLabel($label);
 		$translation_field = mb_convert_case($field_prefix, MB_CASE_TITLE) . 'Translation';
 		$uppercase_label = mb_strtoupper($label);
 
 		$cache_key = ($allow_editing ? '' : 'NE:') . $uppercase_label;
 
 		if ( isset($this->Phrases[$cache_key]) ) {
 			$translated_label = $this->Phrases[$cache_key][$translation_field];
 
 			if ($this->_editExisting && $allow_editing && !array_key_exists($uppercase_label, $this->_missingPhrases)) {
 				// option to change translation for Labels
 				$edit_link = $this->getRawEditLink($label);
 				$translated_label = $this->getEditHtmlCode($edit_link, $translated_label, 'Edit translation');
 			}
 
 			return $translated_label;
 		}
 
 		$this->LoadPhraseByLabel($uppercase_label, $original_label, $allow_editing, $use_admin);
 
 		return $this->GetPhrase($original_label, $allow_editing);
 	}
 
 	function LoadPhraseByLabel($uppercase_label, $original_label, $allow_editing = true, $use_admin = false)
 	{
 		if ( !$allow_editing && !$use_admin && !isset($this->_missingPhrases[$uppercase_label]) && isset($this->Phrases[$uppercase_label]) ) {
 			// label is already translated, but it's version without on the fly translation code is requested
 			$this->Phrases['NE:' . $uppercase_label] = $this->Phrases[$uppercase_label];
 
 			return true;
 		}
 
 		$language_id = $use_admin ? $this->AdminLanguageId : $this->LanguageId;
 
 		$sql = 'SELECT PhraseId, l' . $language_id . '_Translation AS Translation, l' . $language_id . '_HintTranslation AS HintTranslation, l' . $language_id . '_ColumnTranslation AS ColumnTranslation
 				FROM ' . TABLE_PREFIX . 'LanguageLabels
 				WHERE (PhraseKey = ' . $this->Conn->qstr($uppercase_label) . ') AND (l' . $language_id . '_Translation IS NOT NULL)';
 		$res = $this->Conn->GetRow($sql);
 
 		if ($res === false || count($res) == 0) {
 			$translation = '!' . $uppercase_label . '!';
 
 			if ($this->_editMissing && $allow_editing) {
 				list (, $original_label) = $this->parseLabel($original_label);
 				$edit_url = $this->getEditLink($original_label);
 				$translation = $this->getEditHtmlCode($edit_url, $translation, 'Translate');
 
 				$this->_missingPhrases[$uppercase_label] = true; // add as key for faster accessing
 			}
 
 			// add it as already cached, as long as we don't need to cache not found phrase
 			$this->AddCachedPhrase($uppercase_label, $translation, $allow_editing);
 
 			return false;
 		}
 
 		$cache_key = ($allow_editing ? '' : 'NE:') . $uppercase_label;
 		$this->Phrases[$cache_key] = $res;
 
 		array_push($this->Ids, $res['PhraseId']);
 		$this->Ids = array_unique($this->Ids); // just to make sure
 
 		return true;
 	}
 
 	/**
 	 * Parse label into translation field prefix and actual label.
 	 *
 	 * @param string $label Phrase label.
 	 *
 	 * @return array
 	 */
 	protected function parseLabel($label)
 	{
 		if ( strpos($label, ':') === false || preg_match('/^(HINT|COLUMN):(.*)$/i', $label, $regs) == 0 ) {
 			return array('', $label);
 		}
 
 		return array($regs[1], $regs[2]);
 	}
 
 	/**
 	 * Sort params by name and then by length
 	 *
 	 * @param string $a
 	 * @param string $b
 	 * @return int
 	 * @access private
 	 */
 	function CmpParams($a, $b)
 	{
 		$a_len = mb_strlen($a);
 		$b_len = mb_strlen($b);
 		if ($a_len == $b_len) return 0;
 		return $a_len > $b_len ? -1 : 1;
 	}
 
 	/**
 	 * Replace language tags in exclamation marks found in text
 	 *
 	 * @param string $text
 	 * @param bool|null $force_escaping force escaping, not escaping of resulting string
 	 * @return mixed
 	 * @access public
 	 */
 	public function ReplaceLanguageTags($text, $force_escaping = null)
 	{
 		$this->fromTag = true;
 		if( isset($force_escaping) ) {
 			$this->fromTag = $force_escaping;
 		}
 
 		preg_match_all("(!(la|lu|lc)[^!]+!)", $text, $res, PREG_PATTERN_ORDER);
 		$language_tags = $res[0];
 		uasort($language_tags, Array(&$this, 'CmpParams'));
 
 		$i = 0;
 		$values = Array();
 
 		foreach ($language_tags as $label) {
 			array_push($values, $this->GetPhrase($label) );
 			//array_push($values, $this->Application->Phrase($label) );
 			$language_tags[$i] = '/' . $language_tags[$i] . '/';
 			$i++;
 		}
 
 		$this->fromTag = false;
 
 		return preg_replace($language_tags, $values, $text);
 	}
 
 	/**
 	 * Escape chars in phrase translation, that could harm parser to process tag
 	 *
 	 * @param string $text
 	 * @return string
 	 * @access private
 	 */
 	function escapeTagReserved($text)
 	{
 		$reserved = Array('"', "'"); // =
 		$replacement = Array('\"', "\'"); // \=
 
 		return str_replace($reserved, $replacement, $text);
 	}
 
 }
Index: branches/5.3.x/core/kernel/globals.php
===================================================================
--- branches/5.3.x/core/kernel/globals.php	(revision 16518)
+++ branches/5.3.x/core/kernel/globals.php	(revision 16519)
@@ -1,1076 +1,1076 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class kUtil {
 
 //	const KG_TO_POUND = 2.20462262;
 
 	const POUND_TO_KG = 0.45359237;
 
 	/**
 	 * Escape text as HTML.
 	 *
 	 * @see escape
 	 */
 	const ESCAPE_HTML = 'html';
 
 	/**
 	 * Escape text as JavaScript.
 	 *
 	 * @see escape
 	 */
 	const ESCAPE_JS = 'js';
 
 	/**
 	 * Escape text as Url.
 	 */
 	const ESCAPE_URL = 'url';
 
 	/**
 	 * Don't escape anything.
 	 */
 	const ESCAPE_RAW = 'raw';
 
 	/**
 	 * Current escape strategy.
 	 *
 	 * @var string
 	 * @see escape
 	 */
 	public static $escapeStrategy = self::ESCAPE_HTML;
 
 	/**
 	 * Checks, that given array is associative.
 	 *
 	 * @param array $array Array.
 	 *
 	 * @return bool
 	 * @access public
 	 */
 	public static function isAssoc($array)
 	{
 		return array_keys($array) !== range(0, count($array) - 1);
 	}
 
 	/**
 	 * Similar to array_merge_recursive but keyed-valued are always overwritten.
 	 * Priority goes to the 2nd array.
 	 *
 	 * @param mixed $array1 Array 1.
 	 * @param mixed $array2 Array 2.
 	 *
 	 * @return array
 	 */
 	public static function array_merge_recursive($array1, $array2)
 	{
 		if ( !is_array($array1) || !is_array($array2) ) {
 			return $array2;
 		}
 
 		foreach ( $array2 as $array2_key => $array2_value ) {
 			if ( isset($array1[$array2_key]) ) {
 				$array1[$array2_key] = self::array_merge_recursive($array1[$array2_key], $array2_value);
 			}
 			else {
 				$array1[$array2_key] = $array2_value;
 			}
 		}
 
 		return $array1;
 	}
 
 	/**
 	 * Prepend a reference to an element to the beginning of an array.
 	 * Renumbers numeric keys, so $value is always inserted to $array[0]
 	 *
 	 * @param $array array
 	 * @param $value mixed
 	 * @return int
 	 * @access public
 	 */
 	public static function array_unshift_ref(&$array, &$value)
 	{
 		$return = array_unshift($array,'');
 		$array[0] =& $value;
 		return $return;
 	}
 
 	/**
 	 * Rename key in associative array, maintaining keys order
 	 *
 	 * @param Array $array Associative Array
 	 * @param mixed $old Old key name
 	 * @param mixed $new New key name
 	 * @access public
 	 */
 	public static function array_rename_key(&$array, $old, $new)
 	{
 		$new_array = Array ();
 
 		foreach ($array as $key => $val) {
 			$new_array[ $key == $old ? $new : $key] = $val;
 		}
 
 		$array = $new_array;
 	}
 
 	/**
 	 * Same as print_r, but outputs result on screen or in debugger report (when in debug mode)
 	 *
 	 * @param Array $data
 	 * @param string $label
 	 * @param bool $on_screen
 	 * @access public
 	 */
 	public static function print_r($data, $label = '', $on_screen = false)
 	{
 		$is_debug = false;
 
 		if ( class_exists('kApplication') && !$on_screen ) {
 			$application =& kApplication::Instance();
 			$is_debug = $application->isDebugMode();
 		}
 
 		if ( $is_debug && isset($application) ) {
 			if ( $label ) {
 				$application->Debugger->appendHTML('<strong>' . $label . '</strong>');
 			}
 
 			$application->Debugger->dumpVars($data);
 		}
 		else {
 			if ( $label ) {
 				echo '<strong>' . $label . '</strong><br/>';
 			}
 
 			echo '<pre>', print_r($data, true), '</pre>';
 		}
 	}
 
 	/**
 	 * Define constant if it was not already defined before
 	 *
 	 * @param string $const_name
 	 * @param string $const_value
 	 * @access public
 	 */
 	public static function safeDefine($const_name, $const_value)
 	{
 		if ( !defined($const_name) ) {
 			define($const_name, $const_value);
 		}
 	}
 
 	/**
 	 * Instantiate kSystemConfig class once and store locally
 	 *
 	 * @access public
 	 */
 	public static function getSystemConfig()
 	{
 		static $system_config;
 
 		if ( !isset($system_config) ) {
 			$system_config = new kSystemConfig();
 		}
 
 		return $system_config;
 	}
 
 	/**
 	 * Same as "include_once", but also profiles file includes in debug mode and DBG_PROFILE_INCLUDES constant is set
 	 *
 	 * @param string $file
 	 * @access public
 	 */
 	public static function includeOnce($file)
 	{
 		global $debugger;
 
 		if ( defined('DEBUG_MODE') && DEBUG_MODE && isset($debugger) && defined('DBG_PROFILE_INCLUDES') && DBG_PROFILE_INCLUDES ) {
 
 			if ( in_array($file, get_included_files()) ) {
 				return ;
 			}
 
 			global $debugger;
 
 			/*$debugger->IncludeLevel++;
 			$before_mem = memory_get_usage();*/
 
 			$debugger->ProfileStart('inc_'.crc32($file), $file);
 			include_once($file);
 			$debugger->ProfileFinish('inc_'.crc32($file));
 			$debugger->profilerAddTotal('includes', 'inc_'.crc32($file));
 
 			/*$used_mem = memory_get_usage() - $before_mem;
 			$debugger->IncludeLevel--;
 			$debugger->IncludesData['file'][] = str_replace(FULL_PATH, '', $file);
 			$debugger->IncludesData['mem'][] = $used_mem;
 			$debugger->IncludesData['time'][] = $used_time;
 			$debugger->IncludesData['level'][] = $debugger->IncludeLevel;*/
 		}
 		else {
 			include_once($file);
 		}
 	}
 
 	/**
 	 * Checks if given string is a serialized array
 	 *
 	 * @param string $string
 	 * @return bool
 	 * @access public
 	 */
 	public static function IsSerialized($string)
 	{
 		if ( is_array($string) ) {
 			return false;
 		}
 
 		return preg_match('/a:([\d]+):{/', $string);
 	}
 
 	/**
 	 * Generates password of given length
 	 *
 	 * @param int $length
 	 * @return string
 	 * @access public
 	 */
 	public static function generatePassword($length = 10)
 	{
 		$pass_length = $length;
 
 		$p1 = Array ('b','c','d','f','g','h','j','k','l','m','n','p','q','r','s','t','v','w','x','y','z');
 		$p2 = Array ('a','e','i','o','u');
 		$p3 = Array ('1','2','3','4','5','6','7','8','9');
 		$p4 = Array ('(','&',')',';','%');    // if you need real strong stuff
 
 		// how much elements in the array
 		// can be done with a array count but counting once here is faster
 
 		$s1 = 21;// this is the count of $p1
 		$s2 = 5; // this is the count of $p2
 		$s3 = 9; // this is the count of $p3
 		$s4 = 5; // this is the count of $p4
 
 		// possible readable combinations
 
 		$c1 = '121';    // will be like 'bab'
 		$c2 = '212';      // will be like 'aba'
 		$c3 = '12';      // will be like 'ab'
 		$c4 = '3';        // will be just a number '1 to 9'  if you dont like number delete the 3
 		//$c5 = '4';        // uncomment to active the strong stuff
 
 		$comb = '4'; // the amount of combinations you made above (and did not comment out)
 
 		for ($p = 0; $p < $pass_length;) {
 			mt_srand((double)microtime() * 1000000);
 			$strpart = mt_rand(1, $comb);
 
 			// checking if the stringpart is not the same as the previous one
 			if ($strpart != $previous) {
 				$pass_structure .= ${'c' . $strpart};
 
 				// shortcutting the loop a bit
 				$p = $p + mb_strlen(${'c' . $strpart});
 			}
 			$previous = $strpart;
 		}
 
 		// generating the password from the structure defined in $pass_structure
 		for ($g = 0; $g < mb_strlen($pass_structure); $g++) {
 			mt_srand((double)microtime() * 1000000);
 			$sel = mb_substr($pass_structure, $g, 1);
 			$pass .= ${'p' . $sel}[ mt_rand(0,-1+${'s'.$sel}) ];
 		}
 
 		return $pass;
 	}
 
 	/**
 	 * submits $url with $post as POST
 	 *
 	 * @param string $url
 	 * @param mixed $data
 	 * @param Array $headers
 	 * @param string $request_type
 	 * @param Array $curl_options
 	 * @return string
 	 * @access public
 	 * @deprecated
 	 */
 	public static function curl_post($url, $data, $headers = NULL, $request_type = 'POST', $curl_options = NULL)
 	{
 		$application =& kApplication::Instance();
 
+		/** @var kCurlHelper $curl_helper */
 		$curl_helper = $application->recallObject('CurlHelper');
-		/* @var $curl_helper kCurlHelper */
 
 		if ($request_type == 'POST') {
 			$curl_helper->SetRequestMethod(kCurlHelper::REQUEST_METHOD_POST);
 		}
 
 		$curl_helper->SetRequestData($data);
 
 		if (!is_null($headers)) {
 			// not an associative array, so don't use kCurlHelper::SetHeaders method
 			$curl_helper->setOptions( Array (CURLOPT_HTTPHEADER => $headers) );
 		}
 
 		if (is_array($curl_options)) {
 			$curl_helper->setOptions($curl_options);
 		}
 
 		$curl_helper->followLocation = false;
 		$ret = $curl_helper->Send($url);
 
 		$GLOBALS['curl_errorno'] = $curl_helper->lastErrorCode;
 		$GLOBALS['curl_error'] = $curl_helper->lastErrorMsg;
 
 		return $ret;
 	}
 
 	/**
 	 * Checks if constant is defined and has positive value
 	 *
 	 * @param string $const_name
 	 * @return bool
 	 * @access public
 	 */
 	public static function constOn($const_name)
 	{
 		return defined($const_name) && constant($const_name);
 	}
 
 	/**
 	 * Converts KG to Pounds
 	 *
 	 * @param float $kg
 	 * @param bool $pounds_only
 	 * @return float
 	 * @access public
 	 */
 	public static function Kg2Pounds($kg, $pounds_only = false)
 	{
 		$major = floor( round($kg / self::POUND_TO_KG, 3) );
 		$minor = abs(round(($kg - $major * self::POUND_TO_KG) / self::POUND_TO_KG * 16, 2));
 
 		if ($pounds_only) {
 			$major += round($minor * 0.0625, 2);
 			$minor = 0;
 		}
 		return array($major, $minor);
 	}
 
 	/**
 	 * Converts Pounds to KG
 	 *
 	 * @param float $pounds
 	 * @param float $ounces
 	 * @return float
 	 * @access public
 	 */
 	public static function Pounds2Kg($pounds, $ounces = 0.00)
 	{
 		return round(($pounds + ($ounces / 16)) * self::POUND_TO_KG, 5);
 	}
 
 	/**
 	 * Formats file/memory size in nice way
 	 *
 	 * @param int $bytes
 	 * @return string
 	 * @access public
 	 */
 	public static function formatSize($bytes)
 	{
 		if ($bytes >= 1099511627776) {
 			$return = round($bytes / 1024 / 1024 / 1024 / 1024, 2);
 			$suffix = "TB";
 		} elseif ($bytes >= 1073741824) {
 			$return = round($bytes / 1024 / 1024 / 1024, 2);
 			$suffix = "GB";
 		} elseif ($bytes >= 1048576) {
 			$return = round($bytes / 1024 / 1024, 2);
 			$suffix = "MB";
 		} elseif ($bytes >= 1024) {
 			$return = round($bytes / 1024, 2);
 			$suffix = "KB";
 		} else {
 			$return = $bytes;
 			$suffix = "Byte";
 		}
 
 		$return .= ' '.$suffix;
 
 		return $return;
 	}
 
 	/**
 	 * Enter description here...
 	 *
 	 * @param resource $filePointer the file resource to write to
 	 * @param Array $data the data to write out
 	 * @param string $delimiter the field separator
 	 * @param string $enclosure symbol to enclose field data to
 	 * @param string $recordSeparator symbols to separate records with
 	 * @access public
 	 */
 	public static function fputcsv($filePointer, $data, $delimiter = ',', $enclosure = '"', $recordSeparator = "\r\n")
 	{
 		fwrite($filePointer, self::getcsvline($data, $delimiter, $enclosure, $recordSeparator));
 	}
 
 	/**
 	 * Enter description here...
 	 *
 	 * @param Array $data the data to write out
 	 * @param string $delimiter the field separator
 	 * @param string $enclosure symbol to enclose field data to
 	 * @param string $recordSeparator symbols to separate records with
 	 * @return string
 	 * @access public
 	 */
 	public static function getcsvline($data, $delimiter = ',', $enclosure = '"', $recordSeparator = "\r\n")
 	{
 		ob_start();
 		$fp = fopen('php://output', 'w');
 		fputcsv($fp, $data, $delimiter, $enclosure);
 		fclose($fp);
 		$ret = ob_get_clean();
 
 		if ( $recordSeparator != "\n" ) {
 			return substr($ret, 0, -1) . $recordSeparator;
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Allows to replace #section# within any string with current section
 	 *
 	 * @param string $string
 	 * @return string
 	 * @access public
 	 */
 	public static function replaceModuleSection($string)
 	{
 		$application =& kApplication::Instance();
 		$module_section = $application->RecallVar('section');
 
 		if ($module_section) {
 			// substitute section instead of #section# parameter in title preset name
 			$module_section = explode(':', $module_section);
 			$section = preg_replace('/(configuration|configure)_(.*)/i', '\\2', $module_section[count($module_section) == 2 ? 1 : 0]);
 			$string = str_replace('#section#', mb_strtolower($section), $string);
 		}
 
 		return $string;
 	}
 
 	/**
 	 * Checks, that user IP address is within allowed range
 	 *
 	 * @param string $ip_list semi-column (by default) separated ip address list
 	 * @param string $separator ip address separator (default ";")
 	 *
 	 * @return bool
 	 * @access public
 	 */
 	public static function ipMatch($ip_list, $separator = ';')
 	{
 		if ( php_sapi_name() == 'cli' ) {
 			return false;
 		}
 
 		$ip_match = false;
 		$ip_addresses = $ip_list ? explode($separator, $ip_list) : Array ();
 
 		$application =& kApplication::Instance();
 		$client_ip = $application->getClientIp();
 
 		foreach ($ip_addresses as $ip_address) {
 			if ( self::netMatch($ip_address, $client_ip) ) {
 				$ip_match = true;
 				break;
 			}
 		}
 
 		return $ip_match;
 	}
 
 	/**
 	 * Checks, that given ip belongs to given subnet
 	 *
 	 * @param string $network
 	 * @param string $ip
 	 * @return bool
 	 * @access public
 	 */
 	public static function netMatch($network, $ip)
 	{
 		$network = trim($network);
 		$ip = trim($ip);
 
 		if ( preg_replace('/[\d\.\/-]/', '', $network) != '' ) {
 			$network = gethostbyname($network);
 		}
 
 		if ($network == $ip) {
 			// comparing two ip addresses directly
 			return true;
 		}
 
 		$d = strpos($network, '-');
 		if ($d !== false) {
 			// ip address range specified
 			$from = ip2long(trim(substr($network, 0, $d)));
 			$to = ip2long(trim(substr($network, $d + 1)));
 
 			$ip = ip2long($ip);
 			return ($ip >= $from && $ip <= $to);
 		}
 		elseif (strpos($network, '/') !== false) {
 			// single subnet specified
 			$ip_arr = explode('/', $network);
 
 			if (!preg_match("@\d*\.\d*\.\d*\.\d*@", $ip_arr[0], $matches)) {
 				$ip_arr[0] .= '.0';    // Alternate form 194.1.4/24
 			}
 
 			$network_long = ip2long($ip_arr[0]);
 			$x = ip2long($ip_arr[1]);
 
 			$mask = long2ip($x) == $ip_arr[1] ? $x : (0xffffffff << (32 - $ip_arr[1]));
 			$ip_long = ip2long($ip);
 
 			return ($ip_long & $mask) == ($network_long & $mask);
 		}
 
 		return false;
 	}
 
 	/**
 	 * Returns mime type corresponding to given file
 	 * @param string $file
 	 * @return string
 	 * @access public
 	 */
 	public static function mimeContentType($file)
 	{
 		$ret = self::vendorMimeContentType($file);
 
 		if ( $ret ) {
 			// vendor-specific mime types override any automatic detection
 			return $ret;
 		}
 
 		if ( function_exists('finfo_open') && function_exists('finfo_file') ) {
 			$mime_magic_resource = finfo_open(FILEINFO_MIME_TYPE);
 
 			if ( $mime_magic_resource ) {
 				$ret = finfo_file($mime_magic_resource, $file);
 				finfo_close($mime_magic_resource);
 			}
 		}
 		elseif ( function_exists('mime_content_type') ) {
 			$ret = mime_content_type($file);
 		}
 
 	    return $ret ? $ret : self::mimeContentTypeByExtension($file);
  	}
 
 	/**
 	 * Determines vendor-specific mime type from a given file
 	 *
 	 * @param string $file
 	 * @return bool
 	 * @access public
 	 * @static
 	 */
 	public static function vendorMimeContentType($file)
 	{
 		$file_extension = mb_strtolower(pathinfo(self::removeTempExtension($file), PATHINFO_EXTENSION));
 
 		$mapping = Array (
 			'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
 			'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
 			'docm' => 'application/vnd.ms-word.document.macroEnabled.12',
 			'dotm' => 'application/vnd.ms-word.template.macroEnabled.12',
 			'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
 			'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
 			'xlsm' => 'application/vnd.ms-excel.sheet.macroEnabled.12',
 			'xltm' => 'application/vnd.ms-excel.template.macroEnabled.12',
 			'xlam' => 'application/vnd.ms-excel.addin.macroEnabled.12',
 			'xlsb' => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
 			'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
 			'potx' => 'application/vnd.openxmlformats-officedocument.presentationml.template',
 			'ppsx' => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
 			'ppam' => 'application/vnd.ms-powerpoint.addin.macroEnabled.12',
 			'pptm' => 'application/vnd.ms-powerpoint.presentation.macroEnabled.12',
 			'potm' => 'application/vnd.ms-powerpoint.template.macroEnabled.12',
 			'ppsm' => 'application/vnd.ms-powerpoint.slideshow.macroEnabled.12'
 		);
 
 		return isset($mapping[$file_extension]) ? $mapping[$file_extension] : false;
 	}
 
 	/**
 	 * Detects mime type of the file purely based on it's extension
 	 *
 	 * @param string $file
 	 * @return string
 	 * @access public
 	 */
 	public static function mimeContentTypeByExtension($file)
 	{
 		$file_extension = mb_strtolower(pathinfo(self::removeTempExtension($file), PATHINFO_EXTENSION));
 
 		$mapping = '(xls:application/excel)(hqx:application/macbinhex40)(doc,dot,wrd:application/msword)(pdf:application/pdf)
 					(pgp:application/pgp)(ps,eps,ai:application/postscript)(ppt:application/powerpoint)(rtf:application/rtf)
 					(tgz,gtar:application/x-gtar)(gz:application/x-gzip)(php,php3:application/x-httpd-php)(js:application/x-javascript)
 					(ppd,psd:application/x-photoshop)(swf,swc,rf:application/x-shockwave-flash)(tar:application/x-tar)(zip:application/zip)
 					(mid,midi,kar:audio/midi)(mp2,mp3,mpga:audio/mpeg)(ra:audio/x-realaudio)(wav:audio/wav)(bmp:image/bitmap)(bmp:image/bitmap)
 					(gif:image/gif)(iff:image/iff)(jb2:image/jb2)(jpg,jpe,jpeg:image/jpeg)(jpx:image/jpx)(png:image/png)(tif,tiff:image/tiff)
 					(wbmp:image/vnd.wap.wbmp)(xbm:image/xbm)(css:text/css)(txt:text/plain)(htm,html:text/html)(xml:text/xml)
 					(mpg,mpe,mpeg:video/mpeg)(qt,mov:video/quicktime)(avi:video/x-ms-video)(eml:message/rfc822)
 					(sxw:application/vnd.sun.xml.writer)(sxc:application/vnd.sun.xml.calc)(sxi:application/vnd.sun.xml.impress)
 					(sxd:application/vnd.sun.xml.draw)(sxm:application/vnd.sun.xml.math)
 					(odt:application/vnd.oasis.opendocument.text)(oth:application/vnd.oasis.opendocument.text-web)
 					(odm:application/vnd.oasis.opendocument.text-master)(odg:application/vnd.oasis.opendocument.graphics)
 					(odp:application/vnd.oasis.opendocument.presentation)(ods:application/vnd.oasis.opendocument.spreadsheet)
 					(odc:application/vnd.oasis.opendocument.chart)(odf:application/vnd.oasis.opendocument.formula)
 					(odi:application/vnd.oasis.opendocument.image)';
 
 		if ( preg_match('/[\(,]' . $file_extension . '[,]{0,1}.*?:(.*?)\)/s', $mapping, $regs) ) {
 			return $regs[1];
 		}
 
 		return 'application/octet-stream';
 	}
 
 	/**
 	 * Strips ".tmp" suffix (added by flash uploader) from a filename
 	 *
 	 * @param string $file
 	 * @return string
 	 * @access public
 	 * @static
 	 */
 	public static function removeTempExtension($file)
 	{
 		return preg_replace('/(_[\d]+)?\.tmp$/', '', $file);
 	}
 
 	/**
 	 * Return param value and removes it from params array
 	 *
 	 * @param string $name
 	 * @param Array $params
 	 * @param bool $default
 	 * @return string
 	 */
 	public static function popParam($name, &$params, $default = false)
 	{
 		if ( isset($params[$name]) ) {
 			$value = $params[$name];
 			unset($params[$name]);
 
 			return $value;
 		}
 
 		return $default;
 	}
 
 	/**
 	 * Generate subpath from hashed value
 	 *
 	 * @param string $name
 	 * @param int $levels
 	 * @return string
 	 */
 	public static function getHashPathForLevel($name, $levels = 2)
 	{
 		if ( $levels == 0 ) {
 			return '';
 		}
 		else {
 			$path = '';
 			$hash = md5($name);
 
 			for ($i = 0; $i < $levels; $i++) {
 				$path .= substr($hash, $i, 1) . '/';
 			}
 
 			return $path;
 		}
 	}
 
 	/**
 	 * Calculates the crc32 polynomial of a string (always positive number)
 	 *
 	 * @param string $str
 	 * @return int
 	 */
 	public static function crc32($str)
 	{
 		return sprintf('%u', crc32($str));
 	}
 
 	/**
 	 * Returns instance of DateTime class with date set based on timestamp
 	 *
 	 * @static
 	 * @param int $timestamp
 	 * @return DateTime
 	 * @access public
 	 */
 	public static function dateFromTimestamp($timestamp)
 	{
 		if ( version_compare(PHP_VERSION, '5.3.0', '<') ) {
 			$date = new DateTime('@' . $timestamp);
 			$date->setTimezone(new DateTimeZone(date_default_timezone_get()));
 		}
 		else {
 			$date = new DateTime();
 			$date->setTimestamp($timestamp);
 		}
 
 		return $date;
 	}
 
 	/**
 	 * Returns timestamp from given DateTime class instance
 	 *
 	 * @static
 	 * @param DateTime $date_time
 	 * @return int|string
 	 * @access public
 	 */
 	public static function timestampFromDate(DateTime $date_time)
 	{
 		if ( version_compare(PHP_VERSION, '5.3.0', '<') ) {
 			return $date_time->format('U');
 		}
 
 		return $date_time->getTimestamp();
 	}
 
 	/**
 	 * Generates random numeric id
 	 *
 	 * @static
 	 * @return string
 	 * @access public
 	 */
 	public static function generateId()
 	{
 		list($usec, $sec) = explode(' ', microtime());
 
 		$id_part_1 = substr($usec, 4, 4);
 		$id_part_2 = mt_rand(1, 9);
 		$id_part_3 = substr($sec, 6, 4);
 		$digit_one = substr($id_part_1, 0, 1);
 
 		if ( $digit_one == 0 ) {
 			$digit_one = mt_rand(1, 9);
 			$id_part_1 = preg_replace('/^0/', '', $id_part_1);
 			$id_part_1 = $digit_one . $id_part_1;
 		}
 
 		return $id_part_1 . $id_part_2 . $id_part_3;
 	}
 
 	/**
 	 * Changes script resource limits. Omitted argument results in limit removal.
 	 *
 	 * @static
 	 * @param string|int $memory_limit
 	 * @param int $time_limit
 	 * @return void
 	 * @access public
 	 */
 	public static function setResourceLimit($memory_limit = null, $time_limit = null)
 	{
 		set_time_limit(isset($time_limit) ? $time_limit : 0);
 		ini_set('memory_limit', isset($memory_limit) ? $memory_limit : -1);
 	}
 
 	/**
 	 * Escapes a string.
 	 *
 	 * @param string $text     Text to escape.
 	 * @param string $strategy Escape strategy.
 	 *
 	 * @return string
 	 * @throws InvalidArgumentException When unknown escape strategy is given.
 	 */
 	public static function escape($text, $strategy = null)
 	{
 		if ( !isset($strategy) ) {
 			$strategy = self::$escapeStrategy;
 		}
 
 		if ( strpos($strategy, '+') !== false ) {
 			$previous_strategy = '';
 			$strategies = explode('+', $strategy);
 
 			foreach ($strategies as $current_strategy) {
 				// apply default strategy
 				if ( $current_strategy == '' ) {
 					$current_strategy = self::$escapeStrategy;
 				}
 
 				// don't double-escape
 				if ( $current_strategy != $previous_strategy ) {
 					$text = self::escape($text, $current_strategy);
 					$previous_strategy = $current_strategy;
 				}
 			}
 
 			return $text;
 		}
 
 		if ( $strategy == self::ESCAPE_HTML ) {
 			return htmlspecialchars($text, ENT_QUOTES, CHARSET);
 		}
 
 		if ( $strategy == self::ESCAPE_JS ) {
 			// TODO: consider using "addcslashes", because "addslashes" isn't really for JavaScript escaping (according to docs)
 			$text = addslashes($text);
 			$text = str_replace(array("\r", "\n"), array('\r', '\n'), $text);
 			$text = str_replace('</script>', "</'+'script>", $text);
 
 			return $text;
 		}
 
 		if ( $strategy == self::ESCAPE_URL ) {
 			return rawurlencode($text);
 		}
 
 		if ( $strategy == self::ESCAPE_RAW ) {
 			return $text;
 		}
 
 		throw new InvalidArgumentException(sprintf('Unknown escape strategy "%s"', $strategy));
 	}
 
 	/**
 	 * Unescapes a string.
 	 *
 	 * @param string $text     Text to unescape.
 	 * @param string $strategy Escape strategy.
 	 *
 	 * @return string
 	 * @throws InvalidArgumentException When unknown escape strategy is given.
 	 */
 	public static function unescape($text, $strategy = null)
 	{
 		if ( !isset($strategy) ) {
 			$strategy = self::$escapeStrategy;
 		}
 
 		if ( strpos($strategy, '+') !== false ) {
 			$previous_strategy = '';
 			$strategies = explode('+', $strategy);
 
 			foreach ($strategies as $current_strategy) {
 				// apply default strategy
 				if ( $current_strategy == '' ) {
 					$current_strategy = self::$escapeStrategy;
 				}
 
 				// don't double-unescape
 				if ( $current_strategy != $previous_strategy ) {
 					$text = self::unescape($text, $current_strategy);
 					$previous_strategy = $current_strategy;
 				}
 			}
 
 			return $text;
 		}
 
 		if ( $strategy == self::ESCAPE_HTML ) {
 			return htmlspecialchars_decode($text, ENT_QUOTES);
 		}
 
 		if ( $strategy == self::ESCAPE_JS ) {
 			// TODO: consider using "stripcslashes", because "stripslashes" isn't really for JavaScript unescaping (according to docs)
 			$text = str_replace("</'+'script>", '</script>', $text);
 			$text = str_replace(array('\r', '\n'), array("\r", "\n"), $text);
 			$text = stripslashes($text);
 
 			return $text;
 		}
 
 		if ( $strategy == self::ESCAPE_URL ) {
 			return rawurldecode($text);
 		}
 
 		if ( $strategy == self::ESCAPE_RAW ) {
 			return $text;
 		}
 
 		throw new InvalidArgumentException(sprintf('Unknown escape strategy "%s"', $strategy));
 	}
 }
 
 /**
  * Returns array value if key exists
  * Accepts infinite number of parameters
  *
  * @param Array $array searchable array
  * @param int $key array key
  * @return string
  */
 function getArrayValue(&$array, $key)
 {
 	$ret = isset($array[$key]) ? $array[$key] : false;
 
 	if ( $ret && func_num_args() > 2 ) {
 		for ($i = 2; $i < func_num_args(); $i++) {
 			$cur_key = func_get_arg($i);
 			$ret = getArrayValue($ret, $cur_key);
 
 			if ( $ret === false ) {
 				break;
 			}
 		}
 	}
 
 	return $ret;
 }
 
 if ( !function_exists('parse_ini_string') ) {
 	/**
 	 * Equivalent for "parse_ini_string" function available since PHP 5.3.0
 	 *
 	 * @param string $ini
 	 * @param bool $process_sections
 	 * @param int $scanner_mode
 	 * @return Array
 	 */
 	function parse_ini_string($ini, $process_sections = false, $scanner_mode = NULL)
 	{
 		# Generate a temporary file.
 		$tempname = tempnam('/tmp', 'ini');
 		$fp = fopen($tempname, 'w');
 		fwrite($fp, $ini);
 		$ini = parse_ini_file($tempname, !empty($process_sections));
 		fclose($fp);
 		@unlink($tempname);
 
 		return $ini;
 	}
 }
 
 if ( !function_exists('memory_get_usage') ) {
 	// PHP 4.x and compiled without --enable-memory-limit option
 	function memory_get_usage() { return -1; }
 }
 
 if ( !function_exists('imagecreatefrombmp') ) {
 	// just in case if GD will add this function in future
 	function imagecreatefrombmp($filename)
 	{
 		//Ouverture du fichier en mode binaire
 		if (! $f1 = fopen($filename,"rb")) return FALSE;
 
 		//1 : Chargement des ent�tes FICHIER
 		$FILE = unpack("vfile_type/Vfile_size/Vreserved/Vbitmap_offset", fread($f1,14));
 		if ($FILE['file_type'] != 19778) return FALSE;
 
 		//2 : Chargement des ent�tes BMP
 		$BMP = unpack('Vheader_size/Vwidth/Vheight/vplanes/vbits_per_pixel'.
 		'/Vcompression/Vsize_bitmap/Vhoriz_resolution'.
 		'/Vvert_resolution/Vcolors_used/Vcolors_important', fread($f1,40));
 		$BMP['colors'] = pow(2,$BMP['bits_per_pixel']);
 		if ($BMP['size_bitmap'] == 0) $BMP['size_bitmap'] = $FILE['file_size'] - $FILE['bitmap_offset'];
 		$BMP['bytes_per_pixel'] = $BMP['bits_per_pixel']/8;
 		$BMP['bytes_per_pixel2'] = ceil($BMP['bytes_per_pixel']);
 		$BMP['decal'] = ($BMP['width']*$BMP['bytes_per_pixel']/4);
 		$BMP['decal'] -= floor($BMP['width']*$BMP['bytes_per_pixel']/4);
 		$BMP['decal'] = 4-(4*$BMP['decal']);
 		if ($BMP['decal'] == 4) $BMP['decal'] = 0;
 
 		//3 : Chargement des couleurs de la palette
 		$PALETTE = array();
 		if ($BMP['colors'] < 16777216)
 		{
 			$PALETTE = unpack('V'.$BMP['colors'], fread($f1,$BMP['colors']*4));
 		}
 
 		//4 : Cr�ation de l'image
 		$IMG = fread($f1,$BMP['size_bitmap']);
 		$VIDE = chr(0);
 
 		$res = imagecreatetruecolor($BMP['width'],$BMP['height']);
 		$P = 0;
 		$Y = $BMP['height']-1;
 		while ($Y >= 0)
 		{
 			$X=0;
 			while ($X < $BMP['width'])
 			{
 				if ($BMP['bits_per_pixel'] == 24)
 				$COLOR = unpack("V",substr($IMG,$P,3).$VIDE);
 				elseif ($BMP['bits_per_pixel'] == 16)
 				{
 					$COLOR = unpack("n",substr($IMG,$P,2));
 					$COLOR[1] = $PALETTE[$COLOR[1]+1];
 				}
 				elseif ($BMP['bits_per_pixel'] == 8)
 				{
 					$COLOR = unpack("n",$VIDE.substr($IMG,$P,1));
 					$COLOR[1] = $PALETTE[$COLOR[1]+1];
 				}
 				elseif ($BMP['bits_per_pixel'] == 4)
 				{
 					$COLOR = unpack("n",$VIDE.substr($IMG,floor($P),1));
 					if (($P*2)%2 == 0) $COLOR[1] = ($COLOR[1] >> 4) ; else $COLOR[1] = ($COLOR[1] & 0x0F);
 					$COLOR[1] = $PALETTE[$COLOR[1]+1];
 				}
 				elseif ($BMP['bits_per_pixel'] == 1)
 				{
 					$COLOR = unpack("n",$VIDE.substr($IMG,floor($P),1));
 					if     (($P*8)%8 == 0) $COLOR[1] =  $COLOR[1]        >>7;
 					elseif (($P*8)%8 == 1) $COLOR[1] = ($COLOR[1] & 0x40)>>6;
 					elseif (($P*8)%8 == 2) $COLOR[1] = ($COLOR[1] & 0x20)>>5;
 					elseif (($P*8)%8 == 3) $COLOR[1] = ($COLOR[1] & 0x10)>>4;
 					elseif (($P*8)%8 == 4) $COLOR[1] = ($COLOR[1] & 0x8)>>3;
 					elseif (($P*8)%8 == 5) $COLOR[1] = ($COLOR[1] & 0x4)>>2;
 					elseif (($P*8)%8 == 6) $COLOR[1] = ($COLOR[1] & 0x2)>>1;
 					elseif (($P*8)%8 == 7) $COLOR[1] = ($COLOR[1] & 0x1);
 					$COLOR[1] = $PALETTE[$COLOR[1]+1];
 				}
 				else
 				return FALSE;
 				imagesetpixel($res,$X,$Y,$COLOR[1]);
 				$X++;
 				$P += $BMP['bytes_per_pixel'];
 			}
 			$Y--;
 			$P+=$BMP['decal'];
 		}
 
 		//Fermeture du fichier
 		fclose($f1);
 
 		return $res;
 	}
 }
Index: branches/5.3.x/core/kernel/nparser/compiler.php
===================================================================
--- branches/5.3.x/core/kernel/nparser/compiler.php	(revision 16518)
+++ branches/5.3.x/core/kernel/nparser/compiler.php	(revision 16519)
@@ -1,142 +1,142 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class NParserCompiler extends kHelper {
 
 	var $Errors = array();
 	var $Templates = array();
 
 	function CompileTemplatesStep()
 	{
 		$templates = $this->Application->RecallVar('templates_to_compile');
 		if ( !$templates ) {
 			// build $templates
 			$templates = $this->FindTemplates();
 		}
 		else {
 			$templates = unserialize($templates);
 		}
 
 		$total = count($templates);
 		$current = $this->Application->RecallVar('current_template_to_compile');
 		if ( !$current ) {
 			$current = 0;
 		}
 
 		$errors = $this->Application->RecallVar('compile_errors');
 		if ( $errors ) {
 			$this->Errors = unserialize($errors);
 		}
 
 		kUtil::safeDefine('DBG_NPARSER_FORCE_COMPILE', 1);
 
 		$i = $current;
 		$this->Application->InitParser(true);
 
 		while ( $i < $total && $i < ($current + 20) ) {
 			$a_template = $templates[$i];
 
 			try {
 				$this->Application->Parser->CheckTemplate($a_template['module'] . '/' . $a_template['path']);
 			} catch ( Exception $e ) {
 				$this->Errors[] = Array ('message' => $e->getMessage(), 'exception_class' => get_class($e), 'file' => $e->getFile(), 'line' => $e->getLine());
 			}
 
 			$i++;
 		}
 
 		$this->Application->StoreVar('current_template_to_compile', $i);
 		$this->Application->StoreVar('templates_to_compile', serialize($templates));
 		$this->Application->StoreVar('compile_errors', serialize($this->Errors));
 		$res = floor(($current / $total) * 100);
 
 		if ( $res == 100 || $current >= $total ) {
 			$this->Application->RemoveVar('templates_to_compile');
 			$this->Application->RemoveVar('current_template_to_compile');
 			$this->Application->Redirect($this->Application->GetVar('finish_template'));
 		}
 
 		echo $res;
 	}
 
 	function FindTemplates()
 	{
 		$this->Templates = Array ();
 
 		// find admin templates
 		foreach ($this->Application->ModuleInfo as $module => $options) {
 			if ($module == 'In-Portal') {
 				// don't check In-Portal admin templates, because it doesn't have them
 				continue;
 			}
 
 			$template_path = '/' . $options['Path'] . 'admin_templates';
 			$options['Path'] = $template_path;
 
 			$this->FindTemplateFiles($template_path, $options);
 		}
 
 		// find Front-End templates (from enabled themes only)
 		$sql = 'SELECT Name
 				FROM ' . $this->Application->getUnitConfig('theme')->getTableName() . '
 				WHERE Enabled = 1';
 		$themes = $this->Conn->GetCol($sql);
 
 		$options = Array ();
 		foreach ($themes as $theme_name) {
 			$template_path = '/themes/' . $theme_name;
 			$options['Name'] = 'theme:' . $theme_name;
 			$options['Path'] = $template_path;
 
 			$this->FindTemplateFiles($template_path, $options);
 		}
 
 		return $this->Templates;
 	}
 
 	/**
 	 * Recursively collects all TPL file across whole installation
 	 *
 	 * @param string $folder_path
 	 * @param Array $options
 	 * @return void
 	 */
 	function FindTemplateFiles($folder_path, $options)
 	{
 		// if FULL_PATH = "/" ensure, that all "/" in $folderPath are not deleted
 		$reg_exp = '/^' . preg_quote(FULL_PATH, '/') . '/';
 		$folder_path = preg_replace($reg_exp, '', $folder_path, 1); // this make sense, since $folderPath may NOT contain FULL_PATH
 
 		$iterator = new DirectoryIterator(FULL_PATH . $folder_path);
-		/* @var $file_info DirectoryIterator */
+		/** @var DirectoryIterator $file_info */
 
 		foreach ($iterator as $file_info) {
 			$filename = $file_info->getFilename();
 			$full_path = $file_info->getPathname();
 
 			if ( $file_info->isDir() && !$file_info->isDot() && $filename != '.svn' && $filename != 'CVS' ) {
 				$this->FindTemplateFiles($full_path, $options);
 			}
 			elseif ( pathinfo($full_path, PATHINFO_EXTENSION) == 'tpl' ) {
 				$this->Templates[] = Array (
 					'module' => mb_strtolower( $options['Name'] ),
 					'path' => str_replace(FULL_PATH . $options['Path'] . '/', '', preg_replace('/\.tpl$/', '', $full_path))
 				);
 			}
 		}
 	}
 
 }
\ No newline at end of file
Index: branches/5.3.x/core/kernel/nparser/nparser.php
===================================================================
--- branches/5.3.x/core/kernel/nparser/nparser.php	(revision 16518)
+++ branches/5.3.x/core/kernel/nparser/nparser.php	(revision 16519)
@@ -1,1232 +1,1233 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 include_once(KERNEL_PATH.'/nparser/ntags.php');
 
 define('TAG_NAMESPACE', 'inp2:');
 define('TAG_NAMESPACE_LENGTH', 5);
 
 class NParser extends kBase {
 
 	var $Stack = Array ();
 	var $Level = 0;
 
 	var $Buffers = array();
 	var $InsideComment = false;
 
 	/**
 	 * Parse tags inside HTML comments
 	 *
 	 * @var bool
 	 */
 	var $SkipComments = true;
 
 	var $Params = array();
 	var $ParamsStack = array();
 	var $ParamsLevel = 0;
 
 	var $Definitions = '';
 
 	/**
 	 * Holds dynamic elements to function names mapping during execution
 	 *
 	 * @var Array
 	 */
 	var $Elements = Array ();
 
 	/**
 	 * Holds location of element definitions inside templates.
 	 * key - element function name, value - array of 2 keys: {from_pos, to_pos}
 	 *
 	 * @var Array
 	 */
 	var $ElementLocations = Array ();
 
 	var $DataExists = false;
 
 	var $TemplateName = null;
 	var $TempalteFullPath = null;
 
 	var $CachePointers = Array ();
 	var $Cachable = Array ();
 
 	/**
 	 * Deep level during parsing
 	 *
 	 * @var int
 	 */
 	var $CacheLevel = 0;
 
 	/**
 	 * Caching in templates enabled
 	 *
 	 * @var bool
 	 */
 	var $CachingEnabled = false;
 
 	/**
 	 * Completely cache given page
 	 *
 	 * @var bool
 	 */
 	var $FullCachePage = false;
 
 	/**
 	 * Prefixes, that are used on current page
 	 *
 	 * @var Array
 	 */
 	var $PrefixesInUse = Array ();
 
 	/**
 	 * Parser parameter names, that are created via m_Capture tag are listed here
 	 *
 	 * @var Array
 	 */
 	var $Captures = array();
 
 	/**
 	 * Phrases, used on "Edit" buttons, that parser adds during block decoration
 	 *
 	 * @var Array
 	 */
 	var $_btnPhrases = Array ();
 
 	/**
 	 * Mod-rewrite system enabled
 	 *
 	 * @var bool
 	 */
 	var $RewriteUrls = false;
 
 	/**
 	 * Current user is logged-in
 	 *
 	 * @var bool
 	 */
 	var $UserLoggedIn = false;
 
 	/**
 	 * Creates template parser object
 	 *
 	 * @access public
 	 */
 	public function __construct()
 	{
 		parent::__construct();
 
 		if (defined('EDITING_MODE') && (EDITING_MODE == EDITING_MODE_DESIGN)) {
 			$this->_btnPhrases['design'] = $this->Application->Phrase('la_btn_EditDesign', false, true);
 			$this->_btnPhrases['block'] = $this->Application->Phrase('la_btn_EditBlock', false, true);
 		}
 
 		$this->RewriteUrls = $this->Application->RewriteURLs();
 		$this->UserLoggedIn = $this->Application->LoggedIn();
 
 		// cache only Front-End templated, when memory caching is available and template caching is enabled in configuration
 		$this->CachingEnabled = !$this->Application->isAdmin && $this->Application->ConfigValue('SystemTagCache') && $this->Application->isCachingType(CACHING_TYPE_MEMORY);
 	}
 
 	function Clear()
 	{
 		// Discard any half-parsed content (e.g. from nested RenderElements).
 		$keep_buffering_levels = kUtil::constOn('SKIP_OUT_COMPRESSION') ? 1 : 2;
 
 		while ( ob_get_level() > $keep_buffering_levels ) {
 			ob_end_clean();
 		}
 
 		$this->Stack = array();
 		$this->Level = 0;
 
 		$this->Buffers = array();
 		$this->InsideComment = false;
 
 		$this->SkipComments = true;
 
 		$this->Params = array();
 		$this->ParamsStack = array();
 		$this->ParamsLevel = 0;
 
 		$this->Definitions = '';
 
 		$this->Elements = array();
 
 		$this->ElementLocations = array();
 
 		$this->DataExists = false;
 
 		$this->TemplateName = null;
 		$this->TempalteFullPath = null;
 
 		$this->CachePointers = array();
 		$this->Cachable = array();
 
 		$this->CacheLevel = 0;
 
 		$this->FullCachePage = false;
 
 		$this->PrefixesInUse = array();
 
 		$this->Captures = array();
 	}
 
 	function Compile($pre_parsed, $template_name = 'unknown')
 	{
 		$data = file_get_contents($pre_parsed['tname']);
 
 		if (!$this->CompileRaw($data, $pre_parsed['tname'], $template_name)) {
 			// compilation failed during errors in template
 //			trigger_error('Template "<strong>' . $template_name . '</strong>" not compiled because of errors', E_USER_WARNING);
 			return false;
 		}
 
 		// saving compiled version (only when compilation was successful)
 		$this->Application->TemplatesCache->saveTemplate($pre_parsed['fname'], $this->Buffers[0]);
 
 		return true;
 	}
 
 	function Parse($raw_template, $name = null)
 	{
 		$this->CompileRaw($raw_template, $name);
 		ob_start();
 		$_parser =& $this;
 		eval('?'.'>'.$this->Buffers[0]);
 
 		return ob_get_clean();
 	}
 
 	function CompileRaw($data, $t_name, $template_name = 'unknown')
 	{
 		$code = "extract (\$_parser->Params);\n";
 		$code .= "\$_parser->ElementLocations['{$template_name}'] = Array('template' => '{$template_name}', 'start_pos' => 0, 'end_pos' => " . strlen($data) . ");\n";
 
 //		$code .= "__@@__DefinitionsMarker__@@__\n";
 
 //		$code .= "if (!\$this->CacheStart('".abs(crc32($t_name))."_0')) {\n";
 		$this->Buffers[0] = '<?'."php $code ?>\n";
 		$this->Cacheable[0] = true;
 		$this->Definitions = '';
 
 		// finding all the tags
 		$reg = '(.*?)(<[\\/]?)' . TAG_NAMESPACE . '([^>]*?)([\\/]?>)(\r\n){0,1}';
 		preg_match_all('/'.$reg.'/s', $data, $results, PREG_SET_ORDER + PREG_OFFSET_CAPTURE);
 
 		$this->InsideComment = false;
 		foreach ($results as $tag_data) {
 			$tag = array(
 				'opening' => $tag_data[2][0],
 				'tag' => $tag_data[3][0],
 				'closing' => $tag_data[4][0],
 				'line' => substr_count(substr($data, 0, $tag_data[2][1]), "\n")+1,
 				'pos' => $tag_data[2][1],
 				'file' => $t_name,
 				'template' => $template_name,
 			);
 
 			// the idea is to count number of comment openings and closings before current tag
 			// if the numbers do not match we inverse the status of InsideComment
 			if ($this->SkipComments && (substr_count($tag_data[1][0], '<!--') != substr_count($tag_data[1][0], '-->'))) {
 				$this->InsideComment = !$this->InsideComment;
 			}
 
 			// appending any text/html data found before tag
 			$this->Buffers[$this->Level] .= $tag_data[1][0];
 			if (!$this->InsideComment) {
 				$tmp_tag = $this->Application->CurrentNTag;
 				$this->Application->CurrentNTag = $tag;
 				if ($this->ProcessTag($tag) === false) {
 					$this->Application->CurrentNTag = $tmp_tag;
 					return false;
 				}
 				$this->Application->CurrentNTag = $tmp_tag;
 			}
 			else {
 				$this->Buffers[$this->Level] .= $tag_data[2][0] . TAG_NAMESPACE . $tag_data[3][0] . $tag_data[4][0];
 			}
 		}
 
 		if ($this->Level > 0) {
 			$error_tag = Array (
 				'file' => $this->Stack[$this->Level]->Tag['file'],
 				'line' => $this->Stack[$this->Level]->Tag['line'],
 			);
 
 			throw new ParserException('Unclosed tag opened by ' . $this->TagInfo($this->Stack[$this->Level]->Tag), 0, null, $error_tag);
 		}
 
 		// appending text data after last tag (after its closing pos),
 		// if no tag was found at all ($tag_data is not set) - append the whole $data
 		$this->Buffers[$this->Level] .= isset($tag_data) ? substr($data, $tag_data[4][1]+strlen($tag_data[4][0])) : $data;
 		$this->Buffers[$this->Level] = preg_replace('/<!--##(.*?)##-->/s', '', $this->Buffers[$this->Level]); // remove hidden comments IB#23065
 //		$this->Buffers[$this->Level] .= '<?'.'php '."\n\$_parser->CacheEnd();\n}\n"." ?".">\n";
 //		$this->Buffers[$this->Level] = str_replace('__@@__DefinitionsMarker__@@__', $this->Definitions, $this->Buffers[$this->Level]);
 
 		return true;
 	}
 
 	function SplitParamsStr($params_str)
 	{
 		preg_match_all('/([\${}a-zA-Z0-9_.\\-\\\\#\\[\\]]+)=(["\']{1,1})(.*?)(?<!\\\)\\2/s', $params_str, $rets, PREG_SET_ORDER);
 
 		$values = Array();
 
 		// we need to replace all occurences of any current param $key with {$key} for correct variable substitution
 		foreach ($rets AS $key => $val){
 			$values[$val[1]] = str_replace('\\' . $val[2], $val[2], $val[3]);
 		}
 
 		return $values;
 	}
 
 	function SplitTag($tag)
 	{
 		if (!preg_match('/([^_ \t\r\n]*)[_]?([^ \t\r\n]*)[ \t\r\n]*(.*)$$/s', $tag['tag'], $parts)) {
 			// this is virtually impossible, but just in case
 			throw new ParserException('Incorrect tag format: ' . $tag['tag'], 0, null, $tag);
 		}
 
 		$splited['prefix'] = $parts[2] ? $parts[1] : '__auto__';
 		$splited['name'] = $parts[2] ? $parts[2] : $parts[1];
 		$splited['attrs'] = $parts[3];
 
 		return $splited;
 	}
 
 	function ProcessTag($tag)
 	{
 		$splited = $this->SplitTag($tag);
 		if ($splited === false) {
 			return false;
 		}
 
 		$tag = array_merge($tag, $splited);
 		$tag['processed'] = false;
 		$tag['NP'] = $this->SplitParamsStr($tag['attrs']);
 
 		$o = '';
 		$tag['is_closing'] = $tag['opening'] == '</' || $tag['closing'] == '/>';
 		if (class_exists('_Tag_'.$tag['name'])) { // block tags should have special handling class
 			if ($tag['opening'] == '<') {
 				$class = '_Tag_'.$tag['name'];
+
+				/** @var _BlockTag $instance */
 				$instance = new $class($tag);
 				$instance->Parser =& $this;
-				/* @var $instance _BlockTag */
 				$this->Stack[++$this->Level] =& $instance;
 				$this->Buffers[$this->Level] = '';
 				$this->Cachable[$this->Level] = true;
 				$open_code = $instance->Open($tag);
 				if ($open_code === false) {
 					return false;
 				}
 				$o .= $open_code;
 			}
 
 			if ($tag['is_closing']) { // not ELSE here, because tag may be <empty/> and still has a handler-class
 				if ($this->Level == 0) {
 					$dump = array();
 					foreach ($this->Stack as $instance) {
 						$dump[] = $instance->Tag;
 					}
 
 					if ( $this->Application->isDebugMode() ) {
 						$this->Application->Debugger->dumpVars($dump);
 					}
 
 					$error_msg = 'Closing tag without an opening: ' . $this->TagInfo($tag) . ' - <strong>probably opening tag was removed or nested tags error</strong>';
 					throw new ParserException($error_msg, 0, null, $tag);
 				}
 
 				if ($this->Stack[$this->Level]->Tag['name'] != $tag['name']) {
 					$opening_tag = $this->Stack[$this->Level]->Tag;
 
 					$error_msg = '	Closing tag ' . $this->TagInfo($tag) . ' does not match
 									opening tag	at current nesting level
 									(' . $this->TagInfo($opening_tag) . '	opened at line ' . $opening_tag['line'] . ')';
 					throw new ParserException($error_msg, 0, null, $tag);
 				}
 
 				$o .= $this->Stack[$this->Level]->Close($tag); // DO NOT use $this->Level-- here because it's used inside Close
 				$this->Level--;
 			}
 		}
 		else { // regular tags - just compile
 			if (!$tag['is_closing']) {
 				$error_msg = 'Tag without a handler: ' . $this->TagInfo($tag) . ' - <strong>probably missing &lt;empty <span style="color: red">/</span>&gt; tag closing</strong>';
 				throw new ParserException($error_msg, 0, null, $tag);
 			}
 
 			if ($this->Level > 0) $o .= $this->Stack[$this->Level]->PassThrough($tag);
 			if (!$tag['processed']) {
 				$compiled = $this->CompileTag($tag);
 				if ($compiled === false) return false;
 				if (isset($tag['NP']['cachable']) && (!$tag['NP']['cachable'] || $tag['NP']['cachable'] ==  'false')) {
 					$this->Cachable[$this->Level] = false;
 				}
 				$o .= '<?'.'php ' . $compiled . " ?>\n";
 //				$o .= '<?'.'php ';
 //				$o .= (isset($tag['NP']['cachable']) && (!$tag['NP']['cachable'] || $tag['NP']['cachable'] ==  'false')) ? $this->BreakCache($compiled, $this->GetPointer($tag)) : $compiled;
 //				$o .= " ?".">\n";
 			}
 		}
 		$this->Buffers[$this->Level] .= $o;
 		return true;
 	}
 
 	function GetPointer($tag)
 	{
 		return abs(crc32($tag['file'])).'_'.$tag['line'];
 	}
 
 	function BreakCache($code, $pointer, $condition='')
 	{
 		return "\$_parser->CacheEnd();\n}\n" . $code."\nif ( !\$_parser->CacheStart('{$pointer}'" . ($condition ? ", {$condition}" : '') . ") ) {\n";
 	}
 
 	function TagInfo($tag, $with_params=false)
 	{
 		return "<b>{$tag['prefix']}_{$tag['name']}".($with_params ? ' '.$tag['attrs'] : '')."</b>";
 	}
 
 	function CompileParamsArray($arr)
 	{
 		$to_pass = 'Array(';
 		foreach ($arr as $name => $val) {
 			$to_pass .= '"'.$name.'" => "'.str_replace('"', '\"', $val).'",';
 		}
 		$to_pass .= ')';
 		return $to_pass;
 	}
 
 	function CompileTag($tag)
 	{
 		$code = '';
 		$to_pass = $this->CompileParamsArray($tag['NP']);
 
 		if ($tag['prefix'] == '__auto__') {
 			$prefix = $this->GetParam('PrefixSpecial');
 			$code .= '$_p_ =& $_parser->GetProcessor($PrefixSpecial);'."\n";
 			$code .= 'echo $_p_->ProcessParsedTag("'.$tag['name'].'", '.$to_pass.', "$PrefixSpecial", \''.$tag['file'].'\', '.$tag['line'].');'."\n";
 		}
 		else {
 			$prefix = $tag['prefix'];
 			$code .= '$_p_ =& $_parser->GetProcessor("'.$tag['prefix'].'");'."\n";
 			$code .= 'echo $_p_->ProcessParsedTag("'.$tag['name'].'", '.$to_pass.', "'.$tag['prefix'].'", \''.$tag['file'].'\', '.$tag['line'].');'."\n";
 		}
 
 		if (array_key_exists('result_to_var', $tag['NP']) && $tag['NP']['result_to_var']) {
 			$code .= "\$params['{$tag['NP']['result_to_var']}'] = \$_parser->GetParam('{$tag['NP']['result_to_var']}');\n";
 			$code .= "\${$tag['NP']['result_to_var']} = \$params['{$tag['NP']['result_to_var']}'];\n";
 		}
 
 		if ($prefix && strpos($prefix, '$') === false) {
 			$p =& $this->GetProcessor($prefix);
 			if (!is_object($p) || !$p->CheckTag($tag['name'], $tag['prefix'])) {
 				$error_msg = 'Unknown tag: ' . $this->TagInfo($tag) . ' - <strong>incorrect tag name or prefix</strong>';
 				throw new ParserException($error_msg, 0, null, $tag);
 			}
 		}
 
 		return $code;
 	}
 
 	function CheckTemplate($t, $silent = null)
 	{
 		$pre_parsed = $this->Application->TemplatesCache->GetPreParsed($t);
 		if (!$pre_parsed) {
 			if (!$silent) {
 				throw new ParserException('Cannot include "<strong>' . $t . '</strong>" - file does not exist');
 			}
 
 			return false;
 		}
 
 		$force_compile = defined('DBG_NPARSER_FORCE_COMPILE') && DBG_NPARSER_FORCE_COMPILE;
 		if (!$pre_parsed || !$pre_parsed['active'] || $force_compile) {
 			$inc_parser = new NParser();
 
 			if ($force_compile) {
 				// remove Front-End theme markings during total compilation
 				$t = preg_replace('/^theme:.*?\//', '', $t);
 			}
 
 			if (!$inc_parser->Compile($pre_parsed, $t)) {
 				return false;
 			}
 		}
 
 		return $pre_parsed;
 	}
 
 	function Run($t, $silent = null)
 	{
 		if ((strpos($t, '../') !== false) || (trim($t) !== $t)) {
 			// when relative paths or special chars are found template names from url, then it's hacking attempt
 			return false;
 		}
 
 		$pre_parsed = $this->CheckTemplate($t, $silent);
 		if (!$pre_parsed) {
 			return false;
 		}
 
 		$backup_template = $this->TemplateName;
 		$backup_fullpath = $this->TempalteFullPath;
 		$this->TemplateName = $t;
 		$this->TempalteFullPath = $pre_parsed['tname'];
 
 		if (!isset($backup_template) && $this->CachingEnabled && !$this->UserLoggedIn && !EDITING_MODE) {
 			// this is main page template -> check for page-based aggressive caching settings
 			$output =& $this->RunMainPage($pre_parsed);
 		}
 		else {
 			$output =& $this->Application->TemplatesCache->runTemplate($this, $pre_parsed);
 		}
 
 		$this->TemplateName = $backup_template;
 		$this->TempalteFullPath = $backup_fullpath;
 
 		return $output;
 	}
 
 	function &RunMainPage($pre_parsed)
 	{
+		/** @var kDBItem $page */
 		$page = $this->Application->recallObject('st.-virtual');
-		/* @var $page kDBItem */
 
 		if ($page->isLoaded()) {
 			// page found in database
 			$debug_mode = $this->Application->isDebugMode(); // don't cache debug output
 			$template_path = preg_replace('/^' . preg_quote(FULL_PATH, '/') . '/', '', $this->TempalteFullPath, 1);
 			$element = ($debug_mode ? 'DEBUG_MODE:' : '') . 'file=' . $template_path;
 			$this->FullCachePage = $page->GetDBField('EnablePageCache');
 
 			if ($this->FullCachePage && $page->GetDBField('PageCacheKey')) {
 				// page caching enabled -> try to get from cache
 				$cache_key = $this->FormCacheKey($element, $page->GetDBField('PageCacheKey'));
 				$output = $this->getCache($cache_key);
 
 				if ($output !== false) {
 					return $output;
 				}
 			}
 
 			// page not cached OR cache expired
 			$output =& $this->Application->TemplatesCache->runTemplate($this, $pre_parsed);
 			$this->generatePageCacheKey($page);
 
 			if ($this->FullCachePage && $page->GetDBField('PageCacheKey')) {
 				$cache_key = $this->FormCacheKey($element, $page->GetDBField('PageCacheKey'));
 				$this->setCache($cache_key, $output, (int)$page->GetDBField('PageExpiration'));
 			}
 		}
 		else {
 			// page not found in database
 			$output =& $this->Application->TemplatesCache->runTemplate($this, $pre_parsed);
 		}
 
 		return $output;
 	}
 
 	/**
 	 * Generate page caching key based on prefixes used on it + prefix IDs passed in url
 	 *
 	 * @param kDBItem $page
 	 */
 	function generatePageCacheKey(&$page)
 	{
 		if (!$page->isLoaded() || $page->GetDBField('OverridePageCacheKey')) {
 			return ;
 		}
 
 		$page_cache_key = Array ();
 		// nobody resets "m" prefix serial, don't count no user too
 		unset($this->PrefixesInUse['m'], $this->PrefixesInUse['u']);
 
 		if (array_key_exists('st', $this->PrefixesInUse)) {
 			// prefix "st" serial will never be changed
 			unset($this->PrefixesInUse['st']);
 			$this->PrefixesInUse['c'] = 1;
 		}
 
 		$prefix_ids = Array ();
 		$prefixes = array_keys($this->PrefixesInUse);
 		asort($prefixes);
 
 		foreach ($prefixes as $index => $prefix) {
 			$id = $this->Application->GetVar($prefix . '_id');
 
 			if (is_numeric($id)) {
 				if (defined('DEBUG_MODE') && DEBUG_MODE && $this->Application->isDebugMode()) {
 					$this->Application->Debugger->appendHTML('Found: "' . $prefix . '_id" = ' . $id . ' during PageCacheKey forming.');
 				}
 
 				$prefix_ids[] = $prefix;
 				unset($prefixes[$index]);
 			}
 		}
 
 		if ($prefix_ids) {
 			$page_cache_key[] = 'prefix_id:' . implode(',', $prefix_ids);
 		}
 
 		if ($prefixes) {
 			$page_cache_key[] = 'prefix:' . implode(',', $prefixes);
 		}
 
 		$page_cache_key = implode(';', $page_cache_key);
 
 		if ($page_cache_key != $page->GetOriginalField('PageCacheKey')) {
 			if (defined('DEBUG_MODE') && DEBUG_MODE && $this->Application->isDebugMode()) {
 				$this->Application->Debugger->appendHTML('Canging PageCacheKey from "<strong>' . $page->GetOriginalField('PageCacheKey') . '</strong>" to "<strong>' . $page_cache_key . '</strong>".');
 			}
 
 			$page->SetDBField('PageCacheKey', $page_cache_key);
 
 			// don't use kDBItem::Update(), because it will change ModifiedById to current front-end user
 			$sql = 'UPDATE ' . $page->TableName . '
 					SET PageCacheKey = ' . $this->Conn->qstr($page_cache_key) . '
 					WHERE ' . $page->IDField . ' = ' . $page->GetID();
 			$this->Conn->Query($sql);
 		}
 	}
 
 	/**
 	 * Creates tag processor and stores it in local cache + factory
 	 *
 	 * @param string $prefix
 	 * @return kTagProcessor
 	 */
 	function &GetProcessor($prefix)
 	{
 		static $processors = Array ();
 
 		if ( !isset($processors[$prefix]) ) {
 			$processors[$prefix] = $this->Application->recallObject($prefix . '_TagProcessor');
 		}
 
 		return $processors[$prefix];
 	}
 
 	/**
 	 * Not tag. Method for parameter selection from list in this TagProcessor
 	 *
 	 * @param Array $params
 	 * @param Array $possible_names
 	 *
 	 * @return string
 	 * @access protected
 	 */
 	protected function SelectParam($params, $possible_names)
 	{
 		if ( !is_array($params) ) {
 			return '';
 		}
 
 		if ( !is_array($possible_names) ) {
 			$possible_names = explode(',', $possible_names);
 		}
 
 		foreach ($possible_names as $name) {
 			if ( isset($params[$name]) ) {
 				return $params[$name];
 			}
 		}
 
 		return '';
 	}
 
 	function SetParams($params)
 	{
 		$this->Params = $params;
 		$keys = array_keys($this->Params);
 	}
 
 	function GetParam($name)
 	{
 		return isset($this->Params[$name]) ? $this->Params[$name] : false;
 	}
 
 	function SetParam($name, $value)
 	{
 		$this->Params[$name] = $value;
 	}
 
 	function PushParams($params)
 	{
 		$this->ParamsStack[$this->ParamsLevel++] = $this->Params;
 		$this->Params = $params;
 	}
 
 	function PopParams()
 	{
 		$this->Params = $this->ParamsStack[--$this->ParamsLevel];
 	}
 
 	function ParseBlock($params, $pass_params=false)
 	{
 		if (array_key_exists('cache_timeout', $params) && $params['cache_timeout']) {
 			$ret = $this->getCache( $this->FormCacheKey('element_' . $params['name']) );
 
 			if ($ret) {
 				return $ret;
 			}
 		}
 
 		if (substr($params['name'], 0, 5) == 'html:') {
 			return substr($params['name'], 5);
 		}
 
 		if (!array_key_exists($params['name'], $this->Elements) && array_key_exists('default_element', $params)) {
 			// when given element not found, but default element name given, then render it instead
 			$params['name'] = $params['default_element'];
 			unset($params['default_element']);
 			return $this->ParseBlock($params, $pass_params);
 		}
 
 		$original_params = $params;
 
 		if ($pass_params || isset($params['pass_params'])) $params = array_merge($this->Params, $params);
 		$this->PushParams($params);
 		$data_exists_bak = $this->DataExists;
 
 		// if we are parsing design block and we have block_no_data - we need to wrap block_no_data into design,
 		// so we should set DataExists to true manually, otherwise the design block will be skipped because of data_exists in params (by Kostja)
 		//
 		// keep_data_exists is used by block RenderElement (always added in ntags.php), to keep the DataExists value
 		// from inside-content block, otherwise when parsing the design block DataExists will be reset to false resulting missing design block (by Kostja)
 		//
 		// Inside-content block parsing result is given to design block in "content" parameter (ntags.php) and "keep_data_exists"
 		// is only passed, when parsing design block. In case, when $this->DataExists is set to true, but
 		// zero-length content (in 2 cases: method NParser::CheckNoData set it OR really empty block content)
 		// is returned from inside-content block, then design block also should not be shown (by Alex)
 		$this->DataExists = (isset($params['keep_data_exists']) && isset($params['content']) && $params['content'] != '' && $this->DataExists) || (isset($params['design']) && isset($params['block_no_data']) && $params['name'] == $params['design']);
 
 		if (!array_key_exists($params['name'], $this->Elements)) {
 			$pre_parsed = $this->Application->TemplatesCache->GetPreParsed($params['name']);
 			if ($pre_parsed) {
 				$ret = $this->IncludeTemplate($params);
 
 				if (array_key_exists('no_editing', $params) && $params['no_editing']) {
 					// when individual render element don't want to be edited
 					return $ret;
 				}
 
 				return defined('EDITING_MODE') ? $this->DecorateBlock($ret, $params, true) : $ret;
 			}
 
 			$trace_results = debug_backtrace();
 
 			$error_tag = Array (
 				'file' => $trace_results[0]['file'],
 				'line' => $trace_results[0]['line'],
 			);
 
 			$error_msg = '<strong>Rendering of undefined element ' . $params['name'] . '</strong>';
 			throw new ParserException($error_msg, 0, null, $error_tag);
 		}
 
 		$m_processor =& $this->GetProcessor('m');
 		$flag_values = $m_processor->PreparePostProcess($params);
 
+		/** @var Closure $f_name */
 		$f_name = $this->Elements[$params['name']];
-		/* @var $f_name Closure */
 
 		$ret = $f_name($this, $params);
 		$ret = $m_processor->PostProcess($ret, $flag_values);
 		$block_params = $this->Params; // input parameters, but modified inside rendered block
 		$this->PopParams();
 
 		if (array_key_exists('result_to_var', $flag_values) && $flag_values['result_to_var']) {
 			// when "result_to_var" used inside ParseBlock, then $$result_to_var parameter is set inside ParseBlock,
 			// but not outside it as expected and got lost at all after PopParams is called, so make it work by
 			// setting it's value on current parameter deep level (from where ParseBlock was called)
 			$this->SetParam($flag_values['result_to_var'], $block_params[ $flag_values['result_to_var'] ]);
 		}
 
 		$this->CheckNoData($ret, $params);
 
 		$this->DataExists = $data_exists_bak || $this->DataExists;
 
 		if (array_key_exists('cache_timeout', $original_params) && $original_params['cache_timeout']) {
 			$cache_key = $this->FormCacheKey('element_' . $original_params['name']);
 			$this->setCache($cache_key, $ret, (int)$original_params['cache_timeout']);
 		}
 
 		if (array_key_exists('no_editing', $block_params) && $block_params['no_editing']) {
 			// when individual render element don't want to be edited
 			return $ret;
 		}
 
 		return defined('EDITING_MODE') ? $this->DecorateBlock($ret, $params) : $ret;
 	}
 
 	/**
 	 * Checks, that given block is defined
 	 *
 	 * @param string $name
 	 * @return bool
 	 */
 	function blockFound($name)
 	{
 		return array_key_exists($name, $this->Elements);
 	}
 
 	function DecorateBlock($block_content, $block_params, $is_template = false)
 	{
 		static $used_ids = Array (), $base_url = null;
 
 		if (!isset($base_url)) {
 			$base_url = $this->Application->BaseURL();
 		}
 
 //		$prepend = '[name: ' . $block_params['name'] . '] [params: ' . implode(', ', array_keys($block_params)) . ']';
 
 		$decorate = false;
 		$design = false;
 
 		if (EDITING_MODE == EDITING_MODE_DESIGN) {
 			$decorate = true;
 
 			if ($is_template) {
 				// content inside pair RenderElement tag
 			}
 			else {
 				if (strpos($block_params['name'], '__capture_') === 0) {
 					// capture tag (usually inside pair RenderElement)
 					$decorate = false;
 				}
 				elseif (array_key_exists('content', $block_params)) {
 					// pair RenderElement (on template, were it's used)
 					$design = true;
 				}
 			}
 		}
 
 		if (!$decorate) {
 			return $block_content;
 		}
 		/*else {
 			$block_content = $prepend . $block_content;
 		}*/
 
 		$block_name = $block_params['name'];
 		$function_name = $is_template ? $block_name : $this->Elements[$block_name];
 
 		$block_title = '';
 		if (array_key_exists($function_name, $this->Application->Parser->ElementLocations)) {
 			$element_location = $this->Application->Parser->ElementLocations[$function_name];
 
 			$block_title .= $element_location['template'] . '.tpl';
 			$block_title .= ' (' . $element_location['start_pos'] . ' - ' . $element_location['end_pos'] . ')';
 		}
 
 		// ensure unique id for every div (used from print lists)
 		$container_num = 1;
 		$container_id = 'parser_block[' . $function_name . ']';
 		while (in_array($container_id . '_' . $container_num, $used_ids)) {
 			$container_num++;
 		}
 
 		$container_id .= '_' . $container_num;
 		$used_ids[] = $container_id;
 
 		// prepare parameter string
 		$param_string = $block_name . ':' . $function_name;
 
 		if ($design) {
 			$btn_text = $this->_btnPhrases['design'];
 			$btn_class = 'cms-edit-design-btn';
 			$btn_container_class = 'block-edit-design-btn-container';
 			$btn_name = 'design';
 		}
 		else {
 			$btn_text = $this->_btnPhrases['block'];
 			$btn_class = 'cms-edit-block-btn';
 			$btn_container_class = 'block-edit-block-btn-container';
 			$btn_name = 'content';
 		}
 
 		$icon_url = $base_url . 'core/admin_templates/img/top_frame/icons/' . $btn_name . '_mode.png';
 
 		$block_editor = '
 			<div id="' . $container_id . '" params="' . $param_string . '" class="' . $btn_container_class . '" title="' . kUtil::escape($block_title, kUtil::ESCAPE_HTML) . '">
 				<button style="background-image: url(' . $icon_url . ');" class="cms-btn-new ' . $btn_class . '" id="' . $container_id . '_btn">' . $btn_text . '</button>
 				<div class="cms-btn-content">
 					%s
 				</div>
 			</div>';
 
 		// 1 - text before, 2 - open tag, 3 - open tag attributes, 4 - content inside tag, 5 - closing tag, 6 - text after closing tag
 		if (preg_match('/^(\s*)<(td|span)(.*?)>(.*)<\/(td|span)>(.*)$/is', $block_content, $regs)) {
 			// div inside span -> put div outside span
 			return $regs[1] . '<' . $regs[2] . ' ' . $regs[3] . '>' . str_replace('%s', $regs[4], $block_editor) . '</' . $regs[5] . '>' . $regs[6];
 		}
 
 		return str_replace('%s', $block_content, $block_editor);
 	}
 
 	function IncludeTemplate($params, $silent=null)
 	{
 		$t = is_array($params) ? $this->SelectParam($params, 't,template,block,name') : $params;
 		$cache_timeout = array_key_exists('cache_timeout', $params) ? $params['cache_timeout'] : false;
 
 		if ($cache_timeout) {
 			$cache_key = $this->FormCacheKey('template:' . $t);
 			$ret = $this->getCache($cache_key);
 
 			if ($ret !== false) {
 				return $ret;
 			}
 		}
 
 		$t = preg_replace('/\.tpl$/', '', $t);
 		$data_exists_bak = $this->DataExists;
 		$this->DataExists = false;
 
 		if (!isset($silent) && array_key_exists('is_silent', $params)) {
 			$silent = $params['is_silent'];
 		}
 
 		if (isset($params['pass_params'])) {
 			// ability to pass params from block to template
 			$params = array_merge($this->Params, $params);
 		}
 
 		$m_processor =& $this->GetProcessor('m');
 		$flag_values = $m_processor->PreparePostProcess($params);
 
 		$this->PushParams($params);
 		$ret = $this->Run($t, $silent);
 		$this->PopParams();
 
 		$ret = $m_processor->PostProcess($ret, $flag_values);
 
 		$this->CheckNoData($ret, $params);
 		$this->DataExists = $data_exists_bak || $this->DataExists;
 
 		if ($cache_timeout) {
 			$this->setCache($cache_key, $ret, (int)$cache_timeout);
 		}
 
 		return $ret;
 	}
 
 	function CheckNoData(&$ret, $params)
 	{
 		if (array_key_exists('data_exists', $params) && $params['data_exists'] && !$this->DataExists) {
 			$block_no_data = isset($params['BlockNoData']) ? $params['BlockNoData'] : (isset($params['block_no_data']) ? $params['block_no_data'] : false);
 			if ($block_no_data)	{
 				$ret = $this->ParseBlock(array('name'=>$block_no_data));
 			}
 			else {
 				$ret = '';
 			}
 		}
 	}
 
 	function getCache($name)
 	{
 		if (!$this->CachingEnabled) {
 			return false;
 		}
 
 		$ret = $this->Application->getCache($name, false);
 
 		if (preg_match('/^\[DE_MARK:(.*?)\]$/', substr($ret, -11), $regs)) {
 			$this->DataExists = $regs[1] ? true : false;
 			$ret = substr($ret, 0, -11);
 		}
 
 		return $ret;
 	}
 
 	function setCache($name, $value, $expiration = 0)
 	{
 		if (!$this->CachingEnabled) {
 			return false;
 		}
 
 		// remeber DataExists in cache, because after cache will be restored
 		// it will not be available naturally (no tags, that set it will be called)
 		$value .= '[DE_MARK:' . (int)$this->DataExists . ']';
 
 		return $this->Application->setCache($name, $value, $expiration);
 	}
 
 	function FormCacheKey($element, $key_string = '')
 	{
 		if (strpos($key_string, 'guest_only') !== false && $this->UserLoggedIn) {
 			// don't cache, when user is logged-in "guest_only" is specified in key
 			return '';
 		}
 
 		$parts = Array ();
 
 		// 1. replace INLINE variable (from request) into key parts
 		if (preg_match_all('/\(%(.*?)\)/', $key_string, $regs)) {
 			// parts in form "(%variable_name)" were found
 			foreach ($regs[1] as $variable_name) {
 				$variable_value = $this->Application->GetVar($variable_name);
 				$key_string = str_replace('(%' . $variable_name . ')', $variable_value, $key_string);
 			}
 		}
 
 		// 2. replace INLINE serial numbers (they may not be related to any prefix at all)
 		// Serial number also could be composed of inline variables!
 		if (preg_match_all('/\[%(.*?)%\]/', $key_string, $regs)) {
 			// format "[%LangSerial%]" - prefix-wide serial in case of any change in "lang" prefix
 			// format "[%LangIDSerial:5%]" - one id-wide serial in case of data, associated with given id was changed
 			// format "[%CiIDSerial:ItemResourceId:5%]" - foreign key-based serial in case of data, associated with given foreign key was changed
 			foreach ($regs[1] as $serial_name) {
 				$serial_value = $this->Application->getCache('[%' . $serial_name . '%]');
 				$key_string = str_replace('[%' . $serial_name . '%]', '[%' . $serial_name . '=' . $serial_value . '%]', $key_string);
 			}
 		}
 
 		/*
 			Always add:
 			===========
 			* "var:m_lang" - show content on current language
 			* "var:t" - template from url, used to differ multiple pages using same physical template (like as design)
 			* "var:admin,editing_mode" - differ cached content when different editing modes are used
 			* "var:m_cat_id,m_cat_page" - pass current category
 			* "var:page,per_page,sort_by" - list pagination/sorting parameters
 			* "prefix:theme-file" - to be able to reset all cached templated using "Rebuild Theme Files" function
 			* "prefix:phrases" - use latest phrase translations
 			* "prefix:conf" - output could slighly differ based on configuration settings
 		*/
 		$key_string = rtrim('var:m_lang,t,admin,editing_mode,m_cat_id,m_cat_page,page,per_page,sort_by;prefix:theme-file,phrases,conf;' . $key_string, ';');
 
 		$keys = explode(';', $key_string);
 
 		/*
 			Possible parts of a $key_string (all can have multiple occurencies):
 			====================================================================
 			* prefix:<prefixA>[,<prefixB>,<prefixC>] - include global serial for given prefix(-es)
 			* skip_prefix:<prefix1>[,<prefix2>,<prefix3>] - exclude global serial for given prefix(-es)
 			* prefix_id:<prefixA>[,<prefixB>,<prefixC>] - include id-based serial for given prefix(-es)
 			* skip_prefix_id:<prefix1>[,<prefix2>,<prefix3>] - exclude id-based serial for given prefix(-es)
 			* var:<aaa>[,<bbb>,<ccc>] - include request variable value(-s)
 			* skip_var:<varA>[,<varB>,<varC>] - exclude request variable value(-s)
 			* (%variable_name) - include request variable value (only value without variable name ifself, like in "var:variable_name")
 			* [%SerialName%] - use to retrieve serial value in free form
 		*/
 
 		// 3. get variable names, prefixes and prefix ids, that should be skipped
 		$skip_prefixes = $skip_prefix_ids = $skip_variables = Array ();
 
 		foreach ($keys as $index => $key) {
 			if (preg_match('/^(skip_var|skip_prefix|skip_prefix_id):(.*?)$/i', $key, $regs)) {
 				unset($keys[$index]);
 				$tmp_parts = explode(',', $regs[2]);
 
 				switch ($regs[1]) {
 					case 'skip_var':
 						$skip_variables = array_merge($skip_variables, $tmp_parts);
 						break;
 
 					case 'skip_prefix':
 						$skip_prefixes = array_merge($skip_prefixes, $tmp_parts);
 						break;
 
 					case 'skip_prefix_id':
 						$skip_prefix_ids = array_merge($skip_prefix_ids, $tmp_parts);
 						break;
 				}
 			}
 		}
 
 		$skip_prefixes = array_unique($skip_prefixes);
 		$skip_variables = array_unique($skip_variables);
 		$skip_prefix_ids = array_unique($skip_prefix_ids);
 
 		// 4. process keys
 		foreach ($keys as $key) {
 			if (preg_match('/^(var|prefix|prefix_id):(.*?)$/i', $key, $regs)) {
 				$tmp_parts = explode(',', $regs[2]);
 
 				switch ($regs[1]) {
 					case 'var':
 						// format: "var:country_id" will become "country_id=<country_id>"
 						$tmp_parts = array_diff($tmp_parts, $skip_variables);
 
 						foreach ($tmp_parts as $variable_name) {
 							$variable_value = $this->Application->GetVar($variable_name);
 
 							if ($variable_value !== false) {
 								$parts[] = $variable_name . '=' . $variable_value;
 							}
 						}
 						break;
 
 					case 'prefix':
 						// format: "prefix:country" will become "[%CountrySerial%]"
 						$tmp_parts = array_diff($tmp_parts, $skip_prefixes);
 
 						foreach ($tmp_parts as $prefix) {
 							$serial_name = $this->Application->incrementCacheSerial($prefix, null, false);
 							$parts[] = '[%' . $serial_name . '=' . $this->Application->getCache($serial_name) . '%]';
 
 							if (!$this->RewriteUrls) {
 								// add env-style page and per-page variable, when mod-rewrite is off
 								$prefix_variables = Array ($prefix . '_Page', $prefix . '_PerPage');
 								foreach ($prefix_variables as $variable_name) {
 									$variable_value = $this->Application->GetVar($variable_name);
 
 									if ($variable_value !== false) {
 										$parts[] = $variable_name . '=' . $variable_value;
 									}
 								}
 							}
 						}
 						break;
 
 					case 'prefix_id':
 						// format: "id:country" will become "[%CountryIDSerial:5%]"
 						$tmp_parts = array_diff($tmp_parts, $skip_prefix_ids);
 
 						foreach ($tmp_parts as $prefix_id) {
 							$id = $this->Application->GetVar($prefix_id . '_id');
 
 							if ($id !== false) {
 								$serial_name = $this->Application->incrementCacheSerial($prefix_id, $id, false);
 								$parts[] = '[%' . $serial_name . '=' . $this->Application->getCache($serial_name) . '%]';
 							}
 						}
 						break;
 				}
 			}
 			elseif ($key == 'currency') {
 				// based on current currency
 				$parts[] = 'curr_iso=' . $this->Application->RecallVar('curr_iso');
 			}
 			elseif ($key == 'groups') {
 				// based on logged-in user groups
 				$parts[] = 'groups=' . $this->Application->RecallVar('UserGroups');
 			}
 			elseif ($key == 'guest_only') {
 				// we know this key, but process it at method beginning
 			}
 			else {
 				throw new ParserException('Unknown key part "<strong>' . $key . '</strong>" used in "<strong>key</strong>" parameter of <inp2:m_Cache key="..."/> tag');
 			}
 		}
 
 		// 5. add unique given cache key identifier on this page
 		$parts[] = $element;
 
 		$key = implode(':', $parts);
 
 		if (defined('DEBUG_MODE') && DEBUG_MODE && $this->Application->isDebugMode()) {
 			$this->Application->Debugger->appendHTML('Parser Key: ' . $key);
 		}
 
 		return 'parser_' . crc32($key);
 	}
 
 	function PushPointer($pointer, $key)
 	{
 		$cache_key = $this->FullCachePage || !$this->CachingEnabled ? '' : $this->FormCacheKey('pointer:' . $pointer, $key);
 
 		$this->CachePointers[++$this->CacheLevel] = $cache_key;
 
 		return $this->CachePointers[$this->CacheLevel];
 	}
 
 	function PopPointer()
 	{
 		return $this->CachePointers[$this->CacheLevel--];
 	}
 
 	function CacheStart($pointer, $key)
 	{
 		$pointer = $this->PushPointer($pointer, $key);
 
 		if ($pointer) {
 			$ret = $this->getCache($pointer);
 
 			$debug_mode = defined('DEBUG_MODE') && DEBUG_MODE && $this->Application->isDebugMode();
 
 			if ($ret !== false) {
 				echo $debug_mode ? '<!-- CACHED OUTPUT START -->' . $ret . '<!-- /CACHED OUTPUT END -->' : $ret;
 				$this->PopPointer();
 
 				return true;
 			}
 
 			if ($debug_mode) {
 				echo '<!-- NO CACHE FOR POINTER: ' . $pointer . ' -->';
 			}
 		}
 
 		ob_start();
 
 		return false;
 	}
 
 	function CacheEnd($expiration = 0)
 	{
 		$ret = ob_get_clean();
 		$pointer = $this->PopPointer();
 
 		if ($pointer) {
 			$res = $this->setCache($pointer, $ret, $expiration);
 
 			if (defined('DEBUG_MODE') && DEBUG_MODE && $this->Application->isDebugMode()) {
 				echo '<!-- STORING CACHE FOR POINTER: ' . $pointer . ' [' . $res . '] -->';
 			}
 		}
 
 		echo $ret;
 	}
 
 	/**
 	 * Performs compression of given files or text
 	 *
 	 * @param mixed $data
 	 * @param bool $raw_script
 	 * @param string $file_extension
 	 * @return string
 	 */
 	function CompressScript($data, $raw_script = false, $file_extension = '')
 	{
+		/** @var MinifyHelper $minify_helper */
 		$minify_helper = $this->Application->recallObject('MinifyHelper');
-		/* @var $minify_helper MinifyHelper */
 
 		if ($raw_script) {
 			$minify_helper->compressString($data, $file_extension);
 
 			return $data;
 		}
 
 		return $minify_helper->CompressScriptTag($data);
 	}
 }
 
 class ParserException extends Exception {
 
 	public function __construct($message = null, $code = 0, $previous = null, $tag = null)
 	{
 		parent::__construct($message, $code, $previous);
 
 		if ( isset($tag) ) {
 			$this->file = $tag['file'];
     		$this->line = $tag['line'];
 		}
 	}
 }
Index: branches/5.3.x/core/kernel/nparser/ntags.php
===================================================================
--- branches/5.3.x/core/kernel/nparser/ntags.php	(revision 16518)
+++ branches/5.3.x/core/kernel/nparser/ntags.php	(revision 16519)
@@ -1,726 +1,727 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class _BlockTag extends kBase {
 
 	/**
 	 * Enter description here...
 	 *
 	 * @var NParser
 	 */
 	var $Parser = null;
 	var $Tag = null;
 
 	/**
 	 * Contains parameter names, that should be given to tag in any case
 	 *
 	 * @var Array
 	 */
 	var $_requiredParams = Array ();
 
 	/**
 	 * Creates new tag
 	 *
 	 * @param Array $tag
 	 * @access public
 	 */
 	public function __construct($tag)
 	{
 		parent::__construct();
 
 		$this->Tag = $tag;
 	}
 
 	function Open($tag)
 	{
 		if (!$this->_checkRequiredParams($tag)) {
 			return false;
 		}
 
 		return '';
 	}
 
 	/**
 	 * Checks, that all required attributes for tag are passed
 	 *
 	 * @param Array $tag
 	 * @return bool
 	 */
 	function _checkRequiredParams($tag)
 	{
 		$missing_params = array_diff($this->_requiredParams, array_keys($tag['NP']));
 		if (!$missing_params) {
 			return true;
 		}
 
 		$error_msg = 'Tag ' . $this->Parser->TagInfo($tag, true) . ' called <strong>without required ' . implode(', ', $missing_params) . '</strong> attribute';
 
 		if (count($missing_params) > 1) {
 			$error_msg .= '(-s)';
 		}
 
 		throw new ParserException($error_msg, 0, null, $tag);
 	}
 
 	/**
 	 * All tags inside block tag are passed through to this method
 	 * Any returned result is appened to current level's buffer
 	 * This can be used to implement special handling of such tags as <inp2:m_else/>
 	 *
 	 * @param unknown_type $tag
 	 * @return unknown
 	 */
 	function PassThrough(&$tag)
 	{
 		return '';
 	}
 
 	function Close($tag)
 	{
 		return $this->Parser->Buffers[$this->Parser->Level];
 	}
 
 	function AppendCode(&$o, $code, $php_tags=true)
 	{
 		if ($php_tags) {
 			$o .= '<?'."php\n" . ( is_array($code) ? "\t".implode("\n\t", $code)."\n" : $code) .'?>';
 		}
 		else {
 			$o .= ( is_array($code) ? "\t".implode("\n\t", $code)."\n" : $code);
 		}
 	}
 }
 
 class _Tag_Comment extends _BlockTag {
 
 	function Open($tag)
 	{
 		$this->Parser->SkipComments = false;
 
 		return '';
 	}
 
 	function Close($tag)
 	{
 		$this->Parser->SkipComments = true;
 
 		return $this->Parser->Buffers[$this->Parser->Level];
 	}
 }
 
 class _Tag_DefineElement extends _BlockTag {
 	/*var $ElemName;
 
 	function Open($tag)
 	{
 		$o = '';
 
 		$pointer = abs(crc32($tag['file'])).'_'.$tag['line'];
 		$f_name = $tag['NP']['name'].'_'.$pointer;
 		$this->ElemName = $tag['NP']['name'];
 
 		$code[] = "\$_parser->Elements['{$tag['NP']['name']}'] = '$f_name';";
 
 		// function_exists is required here, because a template may be included more than once
 		// leading to Cannot redeclare error
 		$code[] = "if (!function_exists('{$f_name}')) {";
 		$code[] = "function $f_name(&\$_parser, \$params) {";
 		$code[] = "global \$application;";
 		$code[] = "if (!\$_output = \$_parser->CacheStart('{$pointer}')) {";
 
 		$defaults = $this->Parser->CompileParamsArray($tag['NP']);
 
 		$code[] = "\$params = array_merge($defaults, \$params);";
 		$code[] = "if (!isset(\$params['PrefixSpecial']) && isset(\$params['prefix'])) {\$params['PrefixSpecial'] = \$params['prefix'];};";
 		$code[] = "extract(\$params);";
 		$code[] = "\$_parser->SetParams(\$params);";
 		$code[] = 'ob_start();';
 		$this->AppendCode($o, $code, false);
 		return $o . '?'.'>';
 	}
 
 	function Close($tag)
 	{
 		$o = $this->Parser->Buffers[$this->Parser->Level];
 		$code[] = "\$_parser->CacheEnd();\n";
 		$code[] = '$_output = ob_get_contents();';
 		$code[] = 'ob_end_clean();';
 		$code[] = '}';
 		$code[] = "return \$_output === true ? '' : \$_output;";
 		$code[] = '}}';
 
 		$code[] = "\$_parser->CachableElements['".$this->ElemName."'] = ".($this->Parser->Cachable[$this->Parser->Level] ? 'true':'false').';';
 
 		$o .= '<?'.'php';
 		$this->AppendCode($o, $code, false);
 
 		return $o;
 //		$this->Parser->Definitions .= $o."\n";
 //		return '';
 	}  */
 
 	public function __construct($tag)
 	{
 		parent::__construct($tag);
 
 		$this->_requiredParams = Array ('name');
 	}
 
 	function Open($tag)
 	{
 		$o = parent::Open($tag);
 
 		if ($o === false) {
 			// some required params not passed
 			return $o;
 		}
 
 		$f_name = $tag['NP']['name'].'_'.abs(crc32($tag['file'])).'_'.$tag['line'];
 		$this->Tag['function_name'] = $f_name; // for later use in closing tag
 
 		$code[] = "\$_parser->Elements['{$tag['NP']['name']}'] = '$f_name';";
 
 		// function_exists is required here, because a template may be included more than once
 		// leading to Cannot redeclare error
 		$code[] = "if (!function_exists('{$f_name}')) {";
 		$code[] = "function $f_name(&\$_parser, \$params) {";
 		$code[] = "global \$application;";
 
 		$tag['NP'] = $this->_extractParams($tag['NP']);
 		$defaults = $this->Parser->CompileParamsArray($tag['NP']);
 
 		$code[] = "\$params = array_merge($defaults, \$params);";
 		$code[] = "if (!isset(\$params['PrefixSpecial']) && isset(\$params['prefix'])) {\$params['PrefixSpecial'] = \$params['prefix'];};";
 		$code[] = 'extract($params, EXTR_SKIP);';
 		$code[] = "\$_parser->SetParams(\$params);";
 		$code[] = 'ob_start();';
 		$this->AppendCode($o, $code);
 		return $o;
 	}
 
 	/**
 	 * Converts $param_name to $params['param_name']
 	 *
 	 * @param Array $params
 	 * @return Array
 	 */
 	function _extractParams($params)
 	{
 		foreach ($params as $param_name => $param_value) {
 			$params[$param_name] = preg_replace('/[\{]{0,1}([\$])(.*?[^\$\s\{\}]*)[\}]{0,1}/', '{$params[\'\\2\']}', $param_value);
 		}
 
 		return $params;
 	}
 
 	function Close($tag)
 	{
 		$o = $this->Parser->Buffers[$this->Parser->Level];
 		$code[] = '$_output = ob_get_contents();';
 		$code[] = 'ob_end_clean();';
 		$code[] = 'return $_output;';
 		$code[] = '}}';
 
 		$end_pos = $tag['pos'] + strlen($tag['opening']) + strlen($tag['tag']) + strlen($tag['closing']) + TAG_NAMESPACE_LENGTH;
 		$code[] = "\$_parser->ElementLocations['{$this->Tag['function_name']}'] = Array('template' => '{$this->Tag['template']}', 'start_pos' => {$this->Tag['pos']}, 'end_pos' => {$end_pos});";
 
 		$this->AppendCode($o, $code);
 		return $o;
 	}
 }
 
 class _Tag_Capture extends _Tag_DefineElement {
 
 	public function __construct($tag)
 	{
 		parent::__construct($tag);
 
 		$this->_requiredParams = Array ('to_var');
 	}
 
 	function Open($tag)
 	{
 		if (!$this->_checkRequiredParams($tag)) {
 			return false;
 		}
 
 		$tag['NP']['name'] = '__capture_'.$tag['NP']['to_var'];
 
 		$o = '';
 		// $this->AppendCode($o, "\$_parser->Captures['{$tag['NP']['to_var']}'] = 1;", false);
 		$this->AppendCode($o, "\$_parser->Captures['{$tag['NP']['to_var']}'] = 1;");
 		$o .= parent::Open($tag);
 		return $o;
 	}
 }
 
 class _Tag_RenderElement extends _Tag_DefineElement {
 	var $Single = true;
 	var $OriginalTag;
 
 	var $_lambdaName = '';
 
 	public function __construct($tag)
 	{
 		parent::__construct($tag);
 
 		if (!$tag['is_closing']) {
 			$this->_requiredParams = Array ('design');
 		}
 	}
 
 	function Open($tag)
 	{
 		if (!$this->_checkRequiredParams($tag)) {
 			return false;
 		}
 
 		$o = '';
 		if ($tag['is_closing']) {
 			if (isset($tag['NP']['design'])) {
 				$this->RenderDesignCode($o, $tag['NP']);
 				return $o;
 			}
 			$to_pass = $this->Parser->CompileParamsArray($tag['NP']);
 /*			$pointer = abs(crc32($tag['file'])).'_'.$tag['line'];
 //			$code[] = "}";
 //			$code[] = "if (!\$_parser->CachableElements['".$tag['NP']['name']."']) {";
 //			$code[] = "\$_parser->CacheEndInside();";
 //			$code[] = "}";
 			$o .= '<?'.'php ';
 
 			$this->AppendCode($o, $this->Parser->BreakCache('', $pointer.'a', "\$_parser->CachableElements['".$tag['NP']['name']."']"), false);
 			$this->AppendCode($o, "echo (\$_parser->ParseBlock($to_pass));\n", false);
 			$this->AppendCode($o, $this->Parser->BreakCache('', $pointer.'b') . " ?".">\n", false);
 //			$this->AppendCode($o, "if (!\$_parser->CacheStartOrContinue(\$_parser->CachableElements['".$tag['NP']['name']."'], '{$pointer}')) {".' ?'.'>', false);
 */
 			$code = array("echo (\$_parser->ParseBlock($to_pass));");
 
 			if ( array_key_exists('result_to_var', $tag['NP']) && $tag['NP']['result_to_var'] ) {
 				$param_name = $tag['NP']['result_to_var'];
 				$code[] = "\$params['{$param_name}'] = \$_parser->GetParam('{$param_name}');";
 				$code[] = "\${$param_name} = \$params['{$param_name}'];";
 			}
 
 			$this->AppendCode($o, $code);
 
 			return $o;
 		}
 		$this->Single = false;
 		$this->OriginalTag = $tag;
 		$tag['NP']['name'] = $tag['NP']['design'] . '_' . abs(crc32($tag['file'])) . '_' . $tag['line']; //'__lambda';
 
 		return parent::Open($tag);
 	}
 
 	function RenderDesignCode(&$o, $params)
 	{
 		$to_pass = $this->Parser->CompileParamsArray($params);
 		$code[] = "echo (\$_parser->ParseBlock(array_merge($to_pass, array('name'=>\"{$params['design']}\",'content'=>\$_parser->ParseBlock($to_pass), 'keep_data_exists'=>1))));";
 		$this->AppendCode($o, $code);
 	}
 
 	function Close($tag)
 	{
 		if ($this->Single) {
 			return $this->Parser->Buffers[$this->Parser->Level];
 		}
 		$o = parent::Close($tag);
 		$this->OriginalTag['NP']['name'] = $this->OriginalTag['NP']['design'] . '_' . abs(crc32($this->OriginalTag['file'])) . '_' . $this->OriginalTag['line']; //'__lambda';
 
 		$this->RenderDesignCode($o, $this->OriginalTag['NP']);
 		return $o;
 	}
 }
 
 class _Tag_RenderElements extends _BlockTag {
 
 	public function __construct($tag)
 	{
 		parent::__construct($tag);
 
 		$this->_requiredParams = Array ('elements');
 	}
 
 	function Open($tag)
 	{
 		$o = parent::Open($tag);
 
 		if ($o === false) {
 			// some required params not passed
 			return $o;
 		}
 
 		$element_names = array_map('trim', explode(',', $tag['NP']['elements']));
 		unset($tag['NP']['elements']);
 
 		$class = '_Tag_RenderElement';
+
+		/** @var _Tag_RenderElement $instance */
 		$instance = new $class($tag);
-		/* @var $instance _Tag_RenderElement */
 
 		$instance->Parser =& $this->Parser;
 
 		$skip_elements = array_key_exists('skip', $tag['NP']) ? array_map('trim', explode(',', $tag['NP']['skip'])) : Array ();
 
 		foreach ($element_names as $element_name) {
 			if (in_array($element_name, $skip_elements) || !$element_name) {
 				// empty element name OR element should be excluded
 				continue;
 			}
 
 			$tag['NP']['name'] = $element_name;
 			$o .= $instance->Open($tag);
 		}
 
 		return $o;
 	}
 }
 
 class _Tag_Param extends _BlockTag {
 
 	public function __construct($tag)
 	{
 		parent::__construct($tag);
 
 		$this->_requiredParams = Array ('name');
 	}
 
 	function Open($tag)
 	{
 		$o = parent::Open($tag);
 
 		if ( $o === false ) {
 			// some required params not passed
 			return $o;
 		}
 
 		$param_name = $tag['NP']['name'];
 		$capture_params = $tag['NP'];
 		$capture_params['name'] = '__capture_' . $param_name;
 
 		$capture_to_pass = $this->Parser->CompileParamsArray($capture_params);
 		$code[] = "if (isset(\$_parser->Captures['{$param_name}'])) {";
 		$code[] = "\t\${$param_name} = \$_parser->ParseBlock($capture_to_pass);";
 		$code[] = "\t\$params['{$param_name}'] = \${$param_name};";
 		$code[] = "\t\$tmp_{$param_name} = \${$param_name};";
 		$code[] = "}";
 		$code[] = "else {";
 
 		$to_pass = $this->Parser->CompileParamsArray($tag['NP']);
 		$code[] = "\t" . '$_p_ =& $_parser->GetProcessor(\'m\');';
 		$code[] = "\t" . '$_tag_params = ' . $to_pass . ';';
 		$code[] = "\t\$tmp_{$param_name} = \$_p_->PostProcess(\${$param_name}, \$_p_->PreparePostProcess(\$_tag_params));";
 		$code[] = "}";
 
 		if ( array_key_exists('result_to_var', $tag['NP']) && $tag['NP']['result_to_var'] ) {
 			$result_to_var = $tag['NP']['result_to_var'];
 			$code[] = "\${$result_to_var} = \$_parser->GetParam('{$result_to_var}');";
 
 			if ( array_key_exists('plus', $tag['NP']) ) {
 				$code[] = "\${$result_to_var} += {$tag['NP']['plus']};";
 			}
 
 			$code[] = "\$params['{$result_to_var}'] = \${$result_to_var};";
 		}
 		elseif ( array_key_exists('plus', $tag['NP']) ) {
 			$code[] = "\$tmp_{$param_name} += {$tag['NP']['plus']};";
 		}
 
 		$code[] = "echo (\$tmp_{$param_name});";
 
 		$this->AppendCode($o, $code);
 
 		return $o;
 	}
 }
 
 class _Tag_Include extends _BlockTag {
 
 	function Open($tag)
 	{
 		$o = '';
 		$to_pass = $this->Parser->CompileParamsArray($tag['NP']);
 		$this->AppendCode($o, "echo (\$_parser->IncludeTemplate($to_pass))");
 		return $o;
 	}
 }
 
 class _Tag_If extends _BlockTag {
 
 	/**
 	 * Permanently inverses if tag (used in ifnot tag)
 	 *
 	 * @var bool
 	 */
 	var $_Inversed = false;
 
 	/**
 	 * Count of "elseif" tags inside
 	 *
 	 * @var int
 	 */
 	var $_elseIfCount = 0;
 
 	public function __construct($tag)
 	{
 		parent::__construct($tag);
 
 		$this->_requiredParams = Array ('check');
 	}
 
 	function Open($tag)
 	{
 		$o = parent::Open($tag);
 
 		if ($o === false) {
 			// some required params not passed
 			return $o;
 		}
 
 		$this->AppendCheckCode($o, $tag);
 
 		return $o;
 	}
 
 	/**
 	 * Adds check code to $o
 	 *
 	 * @param string $o
 	 * @param Array $tag
 	 * @return void
 	 * @access protected
 	 */
 	protected function AppendCheckCode(&$o, $tag)
 	{
 		$to_pass = $this->Parser->CompileParamsArray($tag['NP']);
 
 		$code = Array ();
 		$code[] = "\$_splited = \$_parser->SplitTag(array('tag'=>\"{$tag['NP']['check']}\", 'file'=>'{$tag['file']}', 'line'=>{$tag['line']}));";
 		$code[] = 'if ($_splited[\'prefix\'] == \'__auto__\') {$_splited[\'prefix\'] = $PrefixSpecial;}';
 		$code[] = '$_p_ =& $_parser->GetProcessor($_splited[\'prefix\']);';
 
 		if ( isset($tag['NP']['inverse']) || $this->_Inversed ) {
 			$code[] = "if (!\$_p_->ProcessParsedTag(\$_splited['name'], $to_pass, \$_splited['prefix'], '{$tag['file']}', {$tag['line']})) {";
 		}
 		else {
 			$code[] = "if (\$_p_->ProcessParsedTag(\$_splited['name'], $to_pass, \$_splited['prefix'], '{$tag['file']}', {$tag['line']})) {";
 		}
 
 		$this->AppendCode($o, $code);
 	}
 
 	function PassThrough(&$tag)
 	{
 		$o = '';
 		if ($tag['name'] == 'else') {
 			$this->AppendCode($o, '} else {');
 			$tag['processed'] = true;
 		}
 		if ($tag['name'] == 'elseif') {
 			if (!$this->_checkRequiredParams($tag)) {
 				return '';
 			}
 
 			$this->_elseIfCount++; // add same count of closing brackets in closing tag
 
 			$this->AppendCode($o, "} else {");
 			$this->AppendCheckCode($o, $tag);
 
 			$tag['processed'] = true;
 		}
 		return $o;
 	}
 
 	function Close($tag)
 	{
 		$o = $this->Parser->Buffers[$this->Parser->Level];
 
 		$code = str_repeat("}\n", $this->_elseIfCount + 1);
 		$this->AppendCode($o, $code);
 
 		return $o;
 	}
 }
 
 class _Tag_IfNot extends _Tag_If {
 
 	public function __construct($tag)
 	{
 		parent::__construct($tag);
 
 		$this->_Inversed = true;
 	}
 
 }
 
 class _Tag_DefaultParam extends _BlockTag {
 
 	function Open($tag)
 	{
 		$o = '';
 		foreach ($tag['NP'] as $key => $val)	{
 			$code[] = 'if (!isset($' . $key . ')) $params["' . $key . '"] = "' . $val . '";';
 			$code[] = '$' . $key . ' = isset($' . $key . ') ? $' . $key . ' : "' . $val . '";';
 			$code[] = '$_parser->SetParam("' . $key . '", $' . $key . ');';
 		}
 		$this->AppendCode($o, $code);
 		return $o;
 	}
 }
 
 class _Tag_SetParam extends _BlockTag {
 
 	function Open($tag)
 	{
 		$o = '';
 		foreach ($tag['NP'] as $key => $val)	{
 			$code[] = '$params[\'' . $key . '\'] = "' . $val . '";';
 			$code[] = '$' . $key . ' = "' . $val . '";';
 			$code[] = '$_parser->SetParam(\'' . $key . '\', $' . $key . ');';
 		}
 		$this->AppendCode($o, $code);
 		return $o;
 	}
 }
 
 class _Tag_Cache extends _BlockTag {
 
 	function Open($tag)
 	{
 		$o = '';
 		$pointer = abs(crc32($tag['file'])).'_'.$tag['line'];
 		$key = array_key_exists('key', $tag['NP']) ? $tag['NP']['key'] : '';
 		$this->AppendCode($o, "if (!\$_parser->CacheStart('{$pointer}', \"{$key}\")) {\n");
 
 		return $o;
 	}
 
 	function Close($tag)
 	{
 		$o = $this->Parser->Buffers[$this->Parser->Level];
 		$cache_timeout = array_key_exists('cache_timeout', $this->Tag['NP']) ? $this->Tag['NP']['cache_timeout'] : 0;
 		$this->AppendCode($o, "\$_parser->CacheEnd(" . (int)$cache_timeout . ");\n}\n");
 
 		return $o;
 	}
 
 }
 
 class _Tag_IfDataExists extends _BlockTag {
 
 	function Open($tag)
 	{
 		$o = '';
 		$code = array();
 		$code[] = "ob_start();\n";
 		$code[] = '$_tmp_data_exists = $_parser->DataExists;';
 		$code[] = '$_parser->DataExists = false;';
 		$this->AppendCode($o, $code);
 		return $o;
 	}
 
 	function Close($tag)
 	{
 		$o = $this->Parser->Buffers[$this->Parser->Level];
 		$code = array();
 		$code[] = '$res = ob_get_clean();';
 		$code[] = 'if ($_parser->DataExists) {echo $res;}';
 
 		if (array_key_exists('block_no_data', $this->Tag['NP'])) {
 			$tag_params = $this->Tag['NP'];
 			$tag_params['name'] = $tag_params['block_no_data'];
 			unset($tag_params['block_no_data']);
 
 			$to_pass = $this->Parser->CompileParamsArray($tag_params);
 			$code[] = "else { echo (\$_parser->ParseBlock($to_pass)); }";
 		}
 
 		$code[] = '$_parser->DataExists = $_tmp_data_exists;';
 
 		$this->AppendCode($o, $code);
 		return $o;
 	}
 
 }
 
 class _Tag_Compress extends _BlockTag {
 
 	public function __construct($tag)
 	{
 		parent::__construct($tag);
 
 		if ($tag['is_closing']) {
 			if (!array_key_exists('files', $tag['NP'])) {
 				$this->_requiredParams = Array ('from');
 			}
 			else {
 				$this->_requiredParams = Array ('files');
 			}
 		}
 		else {
 			$this->_requiredParams = Array ('type'); // js/css
 		}
 	}
 
 	/**
 	 * When used as non-block tag, then compress given files and return url to result
 	 *
 	 * @param Array $tag
 	 * @return string
 	 */
 	function Open($tag)
 	{
 		$o = parent::Open($tag);
 
 		if ($o === false) {
 			// some required params not passed
 			return $o;
 		}
 
 		if ($tag['is_closing']) {
 			$to_pass = $this->Parser->CompileParamsArray($tag['NP']);
 			$this->AppendCode($o, "echo \$_parser->CompressScript($to_pass, false);");
 		}
 		else {
 			$this->AppendCode($o, "ob_start();");
 		}
 
 		return $o;
 	}
 
 	/**
 	 * When used as block tag, then compress contents between tags
 	 *
 	 * @param Array $tag
 	 * @return string
 	 */
 	function Close($tag)
 	{
 		if ($this->Tag['is_closing']) {
 			return parent::Close($tag);
 		}
 
 		$o = parent::Close($tag);
 
 		$code = Array ();
 		$code[] = '$res = ob_get_clean();';
 		$code[] = 'echo $_parser->CompressScript($res, true, \'' . $this->Tag['NP']['type'] . '\');';
 
 		$this->AppendCode($o, $code);
 
 		return $o;
 	}
 }
Index: branches/5.3.x/core/kernel/kbase.php
===================================================================
--- branches/5.3.x/core/kernel/kbase.php	(revision 16518)
+++ branches/5.3.x/core/kernel/kbase.php	(revision 16519)
@@ -1,1206 +1,1206 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 //defined('FULL_PATH') or die('restricted access!');
 
 /**
 * Base
 *
 */
 class kBase {
 
 	/**
 	* Reference to global kApplication instance
 	*
 	* @var kApplication
 	* @access protected
 	*/
 	protected $Application = null;
 
 	/**
 	* Connection to database
 	*
 	* @var IDBConnection
 	* @access protected
 	*/
 	protected $Conn = null;
 
 	/**
 	 * Prefix, used during object creation
 	 *
 	 * @var string
 	 * @access public
 	 */
 	public $Prefix = '';
 
 	/**
 	 * Special, used during object creation
 	 *
 	 * @var string
 	 * @access public
 	 */
 	public $Special = '';
 
 	/**
 	 * Joined prefix and special, usually taken directly from
 	 * tag beeing processed, to use in kApplication::recallObject method
 	 *
 	 * @var string
 	 * @access protected
 	 * @see kApplication::recallObject
 	 */
 	protected $prefixSpecial = '';
 
 	/**
 	 * Set's references to kApplication and DBConnection interface class instances
 	 *
 	 * @access public
 	 * @see kApplication
 	 * @see IDBConnection
 	 */
 	public function __construct()
 	{
 		$this->Application =& kApplication::Instance();
 		$this->Conn =& $this->Application->GetADODBConnection();
 	}
 
 	/**
 	 * Set's prefix and special
 	 *
 	 * @param string $prefix
 	 * @param string $special
 	 * @access public
 	 */
 	public function Init($prefix, $special)
 	{
 		$prefix = explode('_', $prefix, 2);
 		$this->Prefix = $prefix[0];
 		$this->Special = $special;
 
 		$this->prefixSpecial = rtrim($this->Prefix . '.' . $this->Special, '.');
 	}
 
 	/**
 	 * Returns prefix and special (when present) joined by a "."
 	 *
 	 * @return string
 	 * @access public
 	 */
 	public function getPrefixSpecial()
 	{
 		return $this->prefixSpecial;
 	}
 
 	/**
 	 * Returns unit config, used in tag
 	 *
 	 * @return kUnitConfig
 	 * @access public
 	 */
 	public function getUnitConfig()
 	{
 		return $this->Application->getUnitConfig($this->Prefix);
 	}
 
 	/**
 	 * Creates string representation of a class (for logging)
 	 *
 	 * @return string
 	 * @access public
 	 */
 	public function __toString()
 	{
 		$ret = 'ClassName: ' . get_class($this);
 
 		try {
 			$ret .= '; PrefixSpecial: ' . $this->getPrefixSpecial();
 		} catch (Exception $e) {}
 
 		return $ret;
 	}
 }
 
 
 class kHelper extends kBase {
 
 	/**
 	 * Performs helper initialization
 	 *
 	 * @access public
 	 */
 	public function InitHelper()
 	{
 
 	}
 
 	/**
 	 * Append prefix and special to tag
 	 * params (get them from tagname) like
 	 * they were really passed as params
 	 *
 	 * @param string $prefix_special
 	 * @param Array $tag_params
 	 * @return Array
 	 * @access protected
 	 */
 	protected function prepareTagParams($prefix_special, $tag_params = Array())
 	{
 		$parts = explode('.', $prefix_special);
 
 		$ret = $tag_params;
 		$ret['Prefix'] = $parts[0];
 		$ret['Special'] = count($parts) > 1 ? $parts[1] : '';
 		$ret['PrefixSpecial'] = $prefix_special;
 
 		return $ret;
 	}
 }
 
 
 abstract class kDBBase extends kBase {
 
 	/**
 	* Name of primary key field for the unit
 	*
 	* @var string
 	* @access public
 	* @see kDBBase::TableName
 	*/
 	public $IDField = '';
 
 	/**
 	* Unit's database table name
 	*
 	* @var string
 	* @access public
 	*/
 	public $TableName = '';
 
 	/**
 	 * Form name, used for validation
 	 *
 	 * @var string
 	 */
 	protected $formName = '';
 
 	/**
 	 * Final form configuration
 	 *
 	 * @var Array
 	 */
 	protected $formConfig = Array ();
 
 	/**
 	* SELECT, FROM, JOIN parts of SELECT query (no filters, no limit, no ordering)
 	*
 	* @var string
 	* @access protected
 	*/
 	protected $SelectClause = '';
 
 	/**
 	* Unit fields definitions (fields from database plus virtual fields)
 	*
 	* @var Array
 	* @access protected
 	*/
 	protected $Fields = Array ();
 
 	/**
 	 * Fields, that have current time as their default value.
 	 *
 	 * @var array
 	 */
 	protected $currentTimeFields = array();
 
 	/**
 	 * Mapping between unit custom field IDs and their names
 	 *
 	 * @var Array
 	 * @access protected
 	 */
 	protected $customFields = Array ();
 
 	/**
 	 * Unit virtual field definitions
 	 *
 	 * @var Array
 	 * @access protected
 	 * @see kDBBase::getVirtualFields()
 	 * @see kDBBase::setVirtualFields()
 	 */
 	protected $VirtualFields = Array ();
 
 	/**
 	 * Fields that need to be queried using custom expression, e.g. IF(...) AS value
 	 *
 	 * @var Array
 	 * @access protected
 	 */
 	protected $CalculatedFields = Array ();
 
 
 	/**
 	 * Fields that contain aggregated functions, e.g. COUNT, SUM, etc.
 	 *
 	 * @var Array
 	 * @access protected
 	 */
 	protected $AggregatedCalculatedFields = Array ();
 
 	/**
 	 * Tells, that multilingual fields sould not be populated by default.
 	 * Can be overriden from kDBBase::Configure method
 	 *
 	 * @var bool
 	 * @access protected
 	 */
 	protected $populateMultiLangFields = false;
 
 	/**
 	 * Event, that was used to create this object
 	 *
 	 * @var kEvent
 	 * @access protected
 	 */
 	protected $parentEvent = null;
 
 	/**
 	 * Sets new parent event to the object
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access public
 	 */
 	public function setParentEvent($event)
 	{
 		$this->parentEvent = $event;
 	}
 
 	/**
 	 * Set object' TableName to LIVE table, defined in unit config
 	 *
 	 * @access public
 	 */
 	public function SwitchToLive()
 	{
 		$this->TableName = $this->getUnitConfig()->getTableName();
 	}
 
 	/**
 	 * Set object' TableName to TEMP table created based on table, defined in unit config
 	 *
 	 * @access public
 	 */
 	public function SwitchToTemp()
 	{
 		$table_name = $this->getUnitConfig()->getTableName();
 		$this->TableName = $this->Application->GetTempName($table_name, 'prefix:' . $this->Prefix);
 	}
 
 	/**
 	 * Checks if object uses temp table
 	 *
 	 * @return bool
 	 * @access public
 	 */
 	public function IsTempTable()
 	{
 		return $this->Application->IsTempTable($this->TableName);
 	}
 
 	/**
 	* Sets SELECT part of list' query
 	*
 	* @param string $sql SELECT and FROM [JOIN] part of the query up to WHERE
 	* @access public
 	*/
 	public function SetSelectSQL($sql)
 	{
 		$this->SelectClause = $sql;
 	}
 
 	/**
 	 * Returns object select clause without any transformations
 	 *
 	 * @return string
 	 * @access public
 	 */
 	public function GetPlainSelectSQL()
 	{
 		return $this->SelectClause;
 	}
 
 	/**
 	 * Returns SELECT part of list' query.
 	 * 1. Occurrences of "%1$s" and "%s" are replaced to kDBBase::TableName
 	 * 2. Occurrences of "%3$s" are replaced to temp table prefix (only for table, using TABLE_PREFIX)
 	 *
 	 * @param string $base_query given base query will override unit default select query
 	 * @param bool $replace_table replace all possible occurrences
 	 * @return string
 	 * @access public
 	 * @see kDBBase::replaceModePrefix
 	 */
 	public function GetSelectSQL($base_query = null, $replace_table = true)
 	{
 		if (!isset($base_query)) {
 			$base_query = $this->SelectClause;
 		}
 
 		if (!$replace_table) {
 			return $base_query;
 		}
 
 		$query = str_replace(Array('%1$s', '%s'), $this->TableName, $base_query);
 
 		return $this->replaceModePrefix($query);
 	}
 
 	/**
 	 * Allows sub-stables to be in same mode as main item (e.g. LEFT JOINED ones)
 	 *
 	 * @param string $query
 	 * @return string
 	 * @access protected
 	 */
 	protected function replaceModePrefix($query)
 	{
 		$live_table = substr($this->Application->GetLiveName($this->TableName), strlen(TABLE_PREFIX));
 
 		if (preg_match('/'.preg_quote(TABLE_PREFIX, '/').'(.*)'.preg_quote($live_table, '/').'/', $this->TableName, $rets)) {
 			// will only happen, when table has a prefix (like in K4)
 			return str_replace('%3$s', $rets[1], $query);
 		}
 
 		// will happen, when K3 table without prefix is used
 		return $query;
 	}
 
 	/**
 	 * Sets calculated fields
 	 *
 	 * @param Array $fields
 	 * @access public
 	 */
 	public function setCalculatedFields($fields)
 	{
 		$this->CalculatedFields = $fields;
 	}
 
 	/**
 	 * Adds calculated field declaration to object.
 	 *
 	 * @param string $name
 	 * @param string $sql_clause
 	 * @access public
 	 */
 	public function addCalculatedField($name, $sql_clause)
 	{
 		$this->CalculatedFields[$name] = $sql_clause;
 	}
 
 	/**
 	 * Returns required mixing of aggregated & non-aggregated calculated fields
 	 *
 	 * @param int $aggregated 0 - having + aggregated, 1 - having only, 2 - aggregated only
 	 * @return Array
 	 * @access public
 	 */
 	public function getCalculatedFields($aggregated = 1)
 	{
 		switch ($aggregated) {
 			case 0:
 				$fields = array_merge($this->CalculatedFields, $this->AggregatedCalculatedFields);
 				break;
 
 			case 1:
 				$fields = $this->CalculatedFields;
 				break;
 
 			case 2:
 				$fields = $this->AggregatedCalculatedFields; // TODO: never used
 				break;
 
 			default:
 				$fields = Array();
 				break;
 		}
 
 		return $fields;
 	}
 
 	/**
 	 * Checks, that given field is a calculated field
 	 *
 	 * @param string $field
 	 * @return bool
 	 * @access public
 	 */
 	public function isCalculatedField($field)
 	{
 		return array_key_exists($field, $this->CalculatedFields);
 	}
 
 	/**
 	 * Insert calculated fields sql into query in place of %2$s,
 	 * return processed query.
 	 *
 	 * @param string $query
 	 * @param int $aggregated 0 - having + aggregated, 1 - having only, 2 - aggregated only
 	 * @return string
 	 * @access protected
 	 */
 	protected function addCalculatedFields($query, $aggregated = 1)
 	{
 		$fields = $this->getCalculatedFields($aggregated);
 		if ( $fields ) {
 			$sql = Array ();
 			// inside calculated field "%2$s" is current language
 			$fields = str_replace('%2$s', $this->Application->GetVar('m_lang'), $fields);
 
 			// can't use "%3$s" as usual, because it's already populated in kDBBase::replaceModePrefix() across whole query
 			$fields = str_replace('%4$s', $this->Application->GetDefaultLanguageId(), $fields);
 
 			foreach ($fields as $field_name => $field_expression) {
 				$sql[] = '(' . $field_expression . ') AS `' . $field_name . '`';
 			}
 			$sql = implode(',', $sql);
 
 			// inside sql "%2$s" is placeholder for calculated fields
 			return $this->Application->ReplaceLanguageTags(str_replace('%2$s', ',' . $sql, $query));
 		}
 
 		return str_replace('%2$s', '', $query);
 	}
 
 	/**
 	 * Performs initial object configuration, which includes setting the following:
 	 * - primary key and table name
 	 * - field definitions (including field modifiers, formatters, default values)
 	 *
 	 * @param bool $populate_ml_fields create all ml fields from db in config or not
 	 * @param string $form_name form name for validation
 	 * @access public
 	 */
 	public function Configure($populate_ml_fields = null, $form_name = null)
 	{
 		if ( isset($populate_ml_fields) ) {
 			$this->populateMultiLangFields = $populate_ml_fields;
 		}
 
 		$config = $this->getUnitConfig();
 		$this->IDField = $config->getIDField();
 		$this->TableName = $config->getTableName();
 
 		$this->initForm($form_name);
 		$this->defineFields();
 
 		$this->ApplyFieldModifiers(null, true); // should be called only after all fields definitions been set
 		$this->prepareConfigOptions(); // this should go last, but before setDefaultValues, order is significant!
 
 		// only set on first call of method
 		if ( isset($populate_ml_fields) ) {
 			$this->SetDefaultValues();
 		}
 	}
 
 	/**
 	 * Adjusts object according to given form name
 	 *
 	 * @param string $form_name
 	 * @return void
 	 * @access protected
 	 */
 	protected function initForm($form_name = null)
 	{
 		$config = $this->getUnitConfig();
 
 		$this->formName = $form_name;
 		$this->formConfig = $config->getFormByName('default', Array ());
 
 		if ( !$this->formName ) {
 			return ;
 		}
 
 		$form_data = $config->getFormByName($this->formName);
 
 		if ( $form_data === false ) {
 			trigger_error('Form "<strong>' . $this->formName . '</strong>" isn\'t declared in "<strong>' . $this->Prefix . '</strong>" unit config.', E_USER_NOTICE);
 		}
 		else {
 			$this->formConfig = kUtil::array_merge_recursive($this->formConfig, $form_data);
 		}
 	}
 
 	/**
 	 * Add field definitions from all possible sources
 	 * Used field sources: database fields, custom fields, virtual fields, calculated fields, aggregated calculated fields
 	 *
 	 * @access protected
 	 */
 	protected function defineFields()
 	{
 		$this->Fields = $this->getFormOption('Fields', Array ());
 		$this->customFields = $this->getFormOption('CustomFields', Array());
 
 		$this->setVirtualFields( $this->getFormOption('VirtualFields', Array ()) );
 
 		$calculated_fields = $this->getFormOption('CalculatedFields', Array());
 		$this->CalculatedFields = $this->getFieldsBySpecial($calculated_fields);
 
 		$aggregated_calculated_fields = $this->getFormOption('AggregatedCalculatedFields', Array());
 		$this->AggregatedCalculatedFields = $this->getFieldsBySpecial($aggregated_calculated_fields);
 	}
 
 	/**
 	 * Returns form name, used for validation
 	 *
 	 * @return string
 	 */
 	public function getFormName()
 	{
 		return $this->formName;
 	}
 
 	/**
 	 * Reads unit (specified by $prefix) option specified by $option and applies form change to it
 	 *
 	 * @param string $option
 	 * @param mixed $default
 	 * @return string
 	 * @access public
 	 */
 	public function getFormOption($option, $default = false)
 	{
 		$ret = $this->getUnitConfig()->getSetting($option, $default);
 
 		if ( isset($this->formConfig[$option]) ) {
 			$ret = kUtil::array_merge_recursive($ret, $this->formConfig[$option]);
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Only exteracts fields, that match current object Special
 	 *
 	 * @param Array $fields
 	 * @return Array
 	 * @access protected
 	 */
 	protected function getFieldsBySpecial($fields)
 	{
 		if ( array_key_exists($this->Special, $fields) ) {
 			return $fields[$this->Special];
 		}
 
 		return array_key_exists('', $fields) ? $fields[''] : Array();
 	}
 
 	/**
 	 * Sets aggeregated calculated fields
 	 *
 	 * @param Array $fields
 	 * @access public
 	 */
 	public function setAggregatedCalculatedFields($fields)
 	{
 		$this->AggregatedCalculatedFields = $fields;
 	}
 
 	/**
 	 * Set's field names from table from config
 	 *
 	 * @param Array $fields
 	 * @access public
 	 */
 	public function setCustomFields($fields)
 	{
 		$this->customFields = $fields;
 	}
 
 	/**
 	 * Returns custom fields information from table from config
 	 *
 	 * @return Array
 	 * @access public
 	 */
 	public function getCustomFields()
 	{
 		return $this->customFields;
 	}
 
 	/**
 	 * Set's fields information from table from config
 	 *
 	 * @param Array $fields
 	 * @access public
 	 */
 	public function setFields($fields)
 	{
 		$this->Fields = $fields;
 	}
 
 	/**
 	 * Returns fields information from table from config
 	 *
 	 * @return Array
 	 * @access public
 	 */
 	public function getFields()
 	{
 		return $this->Fields;
 	}
 
 	/**
 	 * Checks, that given field exists
 	 *
 	 * @param string $field
 	 * @return bool
 	 * @access public
 	 */
 	public function isField($field)
 	{
 		return array_key_exists($field, $this->Fields);
 	}
 
 	/**
 	 * Override field options with ones defined in submit via "field_modfiers" array (common for all prefixes)
 	 *
 	 * @param Array $field_modifiers
 	 * @param bool $from_submit
 	 * @return void
 	 * @access public
 	 * @author Alex
 	 */
 	public function ApplyFieldModifiers($field_modifiers = null, $from_submit = false)
 	{
 		$allowed_modifiers = Array ('required', 'multiple');
 
 		if ( $this->Application->isAdminUser ) {
 			// can change upload dir on the fly (admin only!)
 			$allowed_modifiers[] = 'upload_dir';
 		}
 
 		if ( !isset($field_modifiers) ) {
 			$field_modifiers = $this->Application->GetVar('field_modifiers');
 
 			if ( !$field_modifiers ) {
 				// no field modifiers
 				return;
 			}
 
 			$field_modifiers = getArrayValue($field_modifiers, $this->getPrefixSpecial());
 		}
 
 		if ( !$field_modifiers ) {
 			// no field modifiers for current prefix_special
 			return;
 		}
 
 		$config = $this->getUnitConfig();
 		$fields = $config->getFields(Array ());
 		$virtual_fields = $config->getVirtualFields(Array ());
 
 		foreach ($field_modifiers as $field => $field_options) {
 			foreach ($field_options as $option_name => $option_value) {
 				if ( !in_array(strtolower($option_name), $allowed_modifiers) ) {
 					continue;
 				}
 
 				if ( $from_submit ) {
 					// there are no "lN_FieldName" fields, since ApplyFieldModifiers is
 					// called before PrepareOptions method, which creates them
 					$field = preg_replace('/^l[\d]+_(.*)/', '\\1', $field);
 				}
 
 				if ( $this->isVirtualField($field) ) {
 					$virtual_fields[$field][$option_name] = $option_value;
 					$this->SetFieldOption($field, $option_name, $option_value, true);
 				}
 
 				$fields[$field][$option_name] = $option_value;
 				$this->SetFieldOption($field, $option_name, $option_value);
 			}
 		}
 
 		$config->setFields($fields);
 		$config->setVirtualFields($virtual_fields);
 	}
 
 	/**
 	 * Set fields (+options) for fields that physically doesn't exist in database
 	 *
 	 * @param Array $fields
 	 * @access public
 	 */
 	public function setVirtualFields($fields)
 	{
 		if ($fields) {
 			$this->VirtualFields = $fields;
 			$this->Fields = array_merge($this->VirtualFields, $this->Fields);
 		}
 	}
 
 	/**
 	 * Returns virtual fields
 	 *
 	 * @return Array
 	 * @access public
 	 */
 	public function getVirtualFields()
 	{
 		return $this->VirtualFields;
 	}
 
 	/**
 	 * Checks, that given field is a virtual field
 	 *
 	 * @param string $field
 	 * @return bool
 	 * @access public
 	 */
 	public function isVirtualField($field)
 	{
 		return array_key_exists($field, $this->VirtualFields);
 	}
 
 	/**
 	 * Performs additional initialization for field default values
 	 *
 	 * @access protected
 	 */
 	protected function SetDefaultValues()
 	{
 		foreach ( $this->Fields as $field => $options ) {
 			if ( array_key_exists('default', $options) ) {
 				if ( $options['default'] === '#NOW#' ) {
 					$this->currentTimeFields[] = $field;
 				}
 
 				if ( in_array($field, $this->currentTimeFields) ) {
 					$this->Fields[$field]['default'] = time();
 				}
 			}
 		}
 	}
 
 	/**
 	 * Overwrites field definition in unit config
 	 *
 	 * @param string $field
 	 * @param Array $options
 	 * @param bool $is_virtual
 	 * @access public
 	 */
 	public function SetFieldOptions($field, $options, $is_virtual = false)
 	{
 		if ($is_virtual) {
 			$this->VirtualFields[$field] = $options;
 			$this->Fields = array_merge($this->VirtualFields, $this->Fields);
 		}
 		else {
 			$this->Fields[$field] = $options;
 		}
 	}
 
 	/**
 	 * Changes/sets given option's value in given field definiton
 	 *
 	 * @param string $field
 	 * @param string $option_name
 	 * @param mixed $option_value
 	 * @param bool $is_virtual
 	 * @access public
 	 */
 	public function SetFieldOption($field, $option_name, $option_value, $is_virtual = false)
 	{
 		if ($is_virtual) {
 			$this->VirtualFields[$field][$option_name] = $option_value;
 		}
 
 		$this->Fields[$field][$option_name] = $option_value;
 	}
 
 	/**
 	 * Returns field definition from unit config.
 	 * Also executes sql from "options_sql" field option to form "options" field option
 	 *
 	 * @param string $field
 	 * @param bool $is_virtual
 	 * @return Array
 	 * @access public
 	 */
 	public function GetFieldOptions($field, $is_virtual = false)
 	{
 		$property_name = $is_virtual ? 'VirtualFields' : 'Fields';
 
 		if ( !array_key_exists($field, $this->$property_name) ) {
 			return Array ();
 		}
 
 		if (!$is_virtual) {
 			if (!array_key_exists('options_prepared', $this->Fields[$field]) || !$this->Fields[$field]['options_prepared']) {
 				// executes "options_sql" from field definition, only when field options are accessed (late binding)
 				$this->PrepareFieldOptions($field);
 				$this->Fields[$field]['options_prepared'] = true;
 			}
 		}
 
 		return $this->{$property_name}[$field];
 	}
 
 	/**
 	 * Returns field option
 	 *
 	 * @param string $field
 	 * @param string $option_name
 	 * @param bool $is_virtual
 	 * @param mixed $default
 	 * @return mixed
 	 * @access public
 	 */
 	public function GetFieldOption($field, $option_name, $is_virtual = false, $default = false)
 	{
 		$field_options = $this->GetFieldOptions($field, $is_virtual);
 
 		if ( !$field_options && strpos($field, '#') === false ) {
 			// we use "#FIELD_NAME#" as field for InputName tag in JavaScript, so ignore it
 			$form_name = $this->getFormName();
 			trigger_error('Field "<strong>' . $field . '</strong>" is not defined' . ($form_name ? ' on "<strong>' . $this->getFormName() . '</strong>" form' : '') . ' in "<strong>' . $this->Prefix . '</strong>" unit config', E_USER_WARNING);
 
 			return false;
 		}
 
 		return array_key_exists($option_name, $field_options) ? $field_options[$option_name] : $default;
 	}
 
 	/**
 	 * Returns formatted field value
 	 *
 	 * @param string $name
 	 * @param string $format
 	 *
 	 * @return string
 	 * @access protected
 	 */
 	public function GetField($name, $format = null)
 	{
 		$formatter_class = $this->GetFieldOption($name, 'formatter');
 
 		if ( $formatter_class ) {
 			$value = ($formatter_class == 'kMultiLanguage') && !preg_match('/^l[0-9]+_/', $name) ? '' : $this->GetDBField($name);
 
+			/** @var kFormatter $formatter */
 			$formatter = $this->Application->recallObject($formatter_class);
-			/* @var $formatter kFormatter */
 
 			return $formatter->Format($value, $name, $this, $format);
 		}
 
 		return $this->GetDBField($name);
 	}
 
 	/**
 	 * Returns unformatted field value
 	 *
 	 * @param string $field
 	 * @return string
 	 * @access public
 	 */
 	abstract public function GetDBField($field);
 
 	/**
 	 * Checks of object has given field
 	 *
 	 * @param string $name
 	 * @return bool
 	 * @access public
 	 */
 	abstract public function HasField($name);
 
 	/**
 	 * Returns field values
 	 *
 	 * @return Array
 	 * @access public
 	 */
 	abstract public function GetFieldValues();
 
 	/**
 	 * Populates values of sub-fields, based on formatters, set to mater fields
 	 *
 	 * @param Array $fields
 	 * @access public
 	 * @todo Maybe should not be publicly accessible
 	 */
 	public function UpdateFormattersSubFields($fields = null)
 	{
 		if ( !is_array($fields) ) {
 			$fields = array_keys($this->Fields);
 		}
 
 		foreach ($fields as $field) {
 			if ( isset($this->Fields[$field]['formatter']) ) {
+				/** @var kFormatter $formatter */
 				$formatter = $this->Application->recallObject($this->Fields[$field]['formatter']);
-				/* @var $formatter kFormatter */
 
 				$formatter->UpdateSubFields($field, $this->GetDBField($field), $this->Fields[$field], $this);
 			}
 		}
 	}
 
 	/**
 	 * Use formatters, specified in field declarations to perform additional field initialization in unit config
 	 *
 	 * @access protected
 	 */
 	protected function prepareConfigOptions()
 	{
 		$field_names = array_keys($this->Fields);
 
 		foreach ($field_names as $field_name) {
 			if ( !array_key_exists('formatter', $this->Fields[$field_name]) ) {
 				continue;
 			}
 
+			/** @var kFormatter $formatter */
 			$formatter = $this->Application->recallObject( $this->Fields[$field_name]['formatter'] );
-			/* @var $formatter kFormatter */
 
 			$formatter->PrepareOptions($field_name, $this->Fields[$field_name], $this);
 		}
 	}
 
 	/**
 	 * Escapes fields only, not expressions
 	 *
 	 * @param string $field_expr
 	 * @return string
 	 * @access protected
 	 */
 	protected function escapeField($field_expr)
 	{
 		return preg_match('/[.(]/', $field_expr) ? $field_expr : '`' . $field_expr . '`';
 	}
 
 	/**
 	 * Replaces current language id in given field options
 	 *
 	 * @param string $field_name
 	 * @param Array $field_option_names
 	 * @access protected
 	 */
 	protected function _replaceLanguageId($field_name, $field_option_names)
 	{
 		// don't use GetVar('m_lang') since it's always equals to default language on editing form in admin
 		$current_language_id = $this->Application->Phrases->LanguageId;
 		$primary_language_id = $this->Application->GetDefaultLanguageId();
 
 		$field_options =& $this->Fields[$field_name];
 		foreach ($field_option_names as $option_name) {
 			$field_options[$option_name] = str_replace('%2$s', $current_language_id, $field_options[$option_name]);
 			$field_options[$option_name] = str_replace('%3$s', $primary_language_id, $field_options[$option_name]);
 		}
 	}
 
 	/**
 	 * Transforms "options_sql" field option into valid "options" array for given field
 	 *
 	 * @param string $field_name
 	 * @access protected
 	 */
 	protected function PrepareFieldOptions($field_name)
 	{
 		$field_options =& $this->Fields[$field_name];
 		if (array_key_exists('options_sql', $field_options) ) {
 			// get options based on given sql
 			$replace_options = Array ('option_title_field', 'option_key_field', 'options_sql');
 			$this->_replaceLanguageId($field_name, $replace_options);
 
 			$select_clause = $this->escapeField($field_options['option_title_field']) . ',' . $this->escapeField($field_options['option_key_field']);
 			$sql = sprintf($field_options['options_sql'], $select_clause);
 
 			if (array_key_exists('serial_name', $field_options)) {
 				// try to cache option sql on serial basis
 				$cache_key = 'sql_' . crc32($sql) . '[%' . $field_options['serial_name'] . '%]';
 				$dynamic_options = $this->Application->getCache($cache_key);
 
 				if ($dynamic_options === false) {
 					$this->Conn->nextQueryCachable = true;
 					$dynamic_options = $this->Conn->GetCol($sql, preg_replace('/^.*?\./', '', $field_options['option_key_field']));
 					$this->Application->setCache($cache_key, $dynamic_options);
 				}
 			}
 			else {
 				// don't cache options sql
 				$dynamic_options = $this->Conn->GetCol($sql, preg_replace('/^.*?\./', '', $field_options['option_key_field']));
 			}
 
 			$options_hash = array_key_exists('options', $field_options) ? $field_options['options'] : Array ();
 			$field_options['options'] = kUtil::array_merge_recursive($options_hash, $dynamic_options); // because of numeric keys
 		}
 	}
 
 	/**
 	 * Returns ID of currently processed record
 	 *
 	 * @return int
 	 * @access public
 	 */
 	public function GetID()
 	{
 		return $this->GetDBField($this->IDField);
 	}
 
 	/**
 	 * Allows kDBTagProcessor.SectionTitle to detect if it's editing or new item creation
 	 *
 	 * @return bool
 	 * @access public
 	 */
 	public function IsNewItem()
 	{
 		return $this->GetID() ? false : true;
 	}
 
 	/**
 	 * Returns parent table information
 	 *
 	 * @param string $special special of main item
 	 * @param bool $guess_special if object retrieved with specified special is not loaded, then try not to use special
 	 * @return Array
 	 * @access public
 	 */
 	public function getLinkedInfo($special = '', $guess_special = false)
 	{
 		$config = $this->getUnitConfig();
 		$parent_prefix = $config->getParentPrefix();
 
 		if ( $parent_prefix ) {
 			// if this is linked table, then set id from main table
 			$table_info = Array (
 				'TableName' => $config->getTableName(),
 				'IdField' => $config->getIDField(),
 				'ForeignKey' => $config->getForeignKey($parent_prefix),
 				'ParentTableKey' => $config->getParentTableKey($parent_prefix),
 				'ParentPrefix' => $parent_prefix
 			);
 
+			/** @var kDBItem $main_object */
 			$main_object = $this->Application->recallObject($parent_prefix . '.' . $special, null, Array ('raise_warnings' => 0));
-			/* @var $main_object kDBItem */
 
 			if ( !$main_object->isLoaded() && $guess_special ) {
 				$main_object = $this->Application->recallObject($parent_prefix);
 			}
 
 			$table_info['ParentId'] = $main_object->GetDBField($table_info['ParentTableKey']);
 
 			return $table_info;
 		}
 
 		return false;
 	}
 
 	/**
 	 * Returns true, when list/item was queried/loaded
 	 *
 	 * @return bool
 	 * @access public
 	 */
 	abstract public function isLoaded();
 
 	/**
 	 * Returns specified field value from all selected rows.
 	 * Don't affect current record index
 	 *
 	 * @param string $field
 	 * @return Array
 	 * @access public
 	 */
 	abstract public function GetCol($field);
 }
 
 
 /**
  * Base class for exceptions, that trigger redirect action once thrown
  */
 class kRedirectException extends Exception {
 
 	/**
 	 * Redirect template
 	 *
 	 * @var string
 	 * @access protected
 	 */
 	protected $template = '';
 
 	/**
 	 * Redirect params
 	 *
 	 * @var Array
 	 * @access protected
 	 */
 	protected $params = Array ();
 
 	/**
 	 * Creates redirect exception
 	 *
 	 * @param string $message
 	 * @param int $code
 	 * @param Exception $previous
 	 */
 	public function __construct($message = '', $code = 0, $previous = NULL)
 	{
 		parent::__construct($message, $code, $previous);
 	}
 
 	/**
 	 * Initializes exception
 	 *
 	 * @param string $template
 	 * @param Array $params
 	 * @return void
 	 * @access public
 	 */
 	public function setup($template, $params = Array ())
 	{
 		$this->template = $template;
 		$this->params = $params;
 	}
 
 	/**
 	 * Display exception details in debugger (only useful, when DBG_REDIRECT is enabled) and performs redirect
 	 *
 	 * @return void
 	 * @access public
 	 */
 	public function run()
 	{
 		$application =& kApplication::Instance();
 
 		if ( $application->isDebugMode() ) {
 			$application->Debugger->appendException($this);
 		}
 
 		$application->Redirect($this->template, $this->params);
 	}
 }
 
 
 /**
  * Exception, that is thrown when user don't have permission to perform requested action
  */
 class kNoPermissionException extends kRedirectException {
 
 }
Index: branches/5.3.x/core/units/priorites/priority_eh.php
===================================================================
--- branches/5.3.x/core/units/priorites/priority_eh.php	(revision 16518)
+++ branches/5.3.x/core/units/priorites/priority_eh.php	(revision 16519)
@@ -1,402 +1,402 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class PriorityEventHandler extends kDBEventHandler {
 
 	/**
 	 * Allows to override standard permission mapping
 	 *
 	 * @return void
 	 * @access protected
 	 * @see kEventHandler::$permMapping
 	 */
 	protected function mapPermissions()
 	{
 		parent::mapPermissions();
 
 		$permissions = Array (
 			'OnRecalculatePriorities' => Array ('self' => true),
 		);
 
 		$this->permMapping = array_merge($this->permMapping, $permissions);
 	}
 
 	/**
 	 * Define alternative event processing method names
 	 *
 	 * @return void
 	 * @see kEventHandler::$eventMethods
 	 * @access protected
 	 */
 	protected function mapEvents()
 	{
 		parent::mapEvents();
 
 		$events_map = Array (
 			'OnMassMoveUp' => 'OnChangePriority',
 			'OnMassMoveDown' => 'OnChangePriority',
 		);
 
 		$this->eventMethods = array_merge($this->eventMethods, $events_map);
 	}
 
 	/**
 	 * Occurs, when config was parsed, allows to change config data dynamically
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnAfterConfigRead(kEvent $event)
 	{
 		parent::OnAfterConfigRead($event);
 
 		$hooks = Array(
 			Array(
 				'Mode' => hAFTER,
 				'Conditional' => false,
 				'HookToPrefix' => '',
 				'HookToSpecial' => '*',
 				'HookToEvent' => Array('OnAfterItemLoad', 'OnPreCreate', 'OnListBuild'),
 				'DoPrefix' => 'priority',
 				'DoSpecial' => '*',
 				'DoEvent' => 'OnPreparePriorities',
 				'Conditional' => false,
 			),
 			Array(
 				'Mode' => hBEFORE,
 				'Conditional' => false,
 				'HookToPrefix' => '',
 				'HookToSpecial' => '*',
 				'HookToEvent' => Array('OnPreSaveCreated'),
 				'DoPrefix' => 'priority',
 				'DoSpecial' => '*',
 				'DoEvent' => 'OnPreparePriorities',
 				'Conditional' => false,
 			),
 			Array(
 				'Mode' => hAFTER,
 				'Conditional' => false,
 				'HookToPrefix' => '',
 				'HookToSpecial' => '*',
 				'HookToEvent' => Array('OnPreSave', 'OnPreSaveCreated', 'OnSave', 'OnUpdate'),
 				'DoPrefix' => 'priority',
 				'DoSpecial' => '*',
 				'DoEvent' => 'OnSavePriorityChanges',
 				'Conditional' => false,
 			),
 			Array(
 				'Mode' => hAFTER,
 				'Conditional' => false,
 				'HookToPrefix' => '',
 				'HookToSpecial' => '*',
 				'HookToEvent' => Array('OnSave'),
 				'DoPrefix' => 'priority',
 				'DoSpecial' => '*',
 				'DoEvent' => 'OnSaveItems',
 				'Conditional' => false,
 			),
 			Array(
 				'Mode' => hBEFORE,
 				'Conditional' => false,
 				'HookToPrefix' => '',
 				'HookToSpecial' => '*',
 				'HookToEvent' => Array('OnBeforeItemCreate'),
 				'DoPrefix' => 'priority',
 				'DoSpecial' => '*',
 				'DoEvent' => 'OnItemCreate',
 				'Conditional' => false,
 			),
 			Array(
 				'Mode' => hBEFORE,
 				'Conditional' => false,
 				'HookToPrefix' => '',
 				'HookToSpecial' => '*',
 				'HookToEvent' => Array('OnAfterItemDelete'),
 				'DoPrefix' => 'priority',
 				'DoSpecial' => '*',
 				'DoEvent' => 'OnItemDelete',
 				'Conditional' => false,
 			)
 		);
 
 		$prefixes = $event->getUnitConfig()->getProcessPrefixes(Array ());
 
 		foreach ($prefixes as $prefix) {
 			foreach ($hooks as $hook) {
 				if ( !is_array($hook['HookToEvent']) ) {
 					$hook['HookToEvent'] = Array($hook['HookToEvent']);
 				}
 
 				foreach ($hook['HookToEvent'] as $hook_event) {
 					$this->Application->registerHook(
 						$prefix . '.' . $hook['HookToSpecial'] . ':' . $hook_event,
 						$event->Prefix . '.' . $hook['DoSpecial'] . ':' . $hook['DoEvent'],
 						$hook['Mode'],
 						$hook['Conditional']
 					);
 				}
 			}
 		}
 	}
 
 	/**
 	 * Should be hooked to OnAfterItemLoad, OnPreSaveCreated (why latter?)
 	 *
 	 * @param kEvent $event
 	 */
 	function OnPreparePriorities($event)
 	{
 		if ( !$this->Application->isAdminUser ) {
 			return ;
 		}
 
+		/** @var kPriorityHelper $priority_helper */
 		$priority_helper = $this->Application->recallObject('PriorityHelper');
-		/* @var $priority_helper kPriorityHelper */
 
 		list ($constrain, $joins) = $this->getConstrainInfo($event);
 		$is_new = $event->MasterEvent->Name == 'OnPreCreate' || $event->MasterEvent->Name == 'OnPreSaveCreated';
 		$priority_helper->preparePriorities($event->MasterEvent, $is_new, $constrain, $joins);
 	}
 
 	/**
 	 * Enter description here...
 	 *
 	 * @param kEvent $event
 	 */
 	function OnSavePriorityChanges($event)
 	{
 		if ($event->MasterEvent->status != kEvent::erSUCCESS) {
 			// don't update priorities, when OnSave validation failed
 			return ;
 		}
 
 		$object = $event->MasterEvent->getObject();
 		/* @var $object kDBItem */
 
 		$tmp = $this->Application->RecallVar('priority_changes'.$this->Application->GetVar('m_wid'));
 		$changes = $tmp ? unserialize($tmp) : array();
 
 		if (!isset($changes[$object->GetID()])) {
 			$changes[$object->GetId()]['old'] = $object->GetID() == 0 ? 'new' : $object->GetDBField('OldPriority');
 		}
 
 		if ($changes[$object->GetId()]['old'] == $object->GetDBField('Priority')) return ;
 		$changes[$object->GetId()]['new'] = $object->GetDBField('Priority');
 
 		list ($constrain, $joins) = $this->getConstrainInfo($event);
 
 		if ($constrain) {
 			$changes[$object->GetId()]['constrain'] = $constrain;
 		}
 
 		$this->Application->StoreVar('priority_changes'.$this->Application->GetVar('m_wid'), serialize($changes));
 	}
 
 	/**
 	 * Enter description here...
 	 *
 	 * @param kEvent $event
 	 */
 	function OnItemDelete($event)
 	{
 		// just store the prefix in which the items were deleted
 		$del = $this->Application->RecallVar('priority_deleted' . $this->Application->GetVar('m_wid'));
 		$del = $del ? unserialize($del) : array();
 
 		list ($constrain, $joins) = $this->getConstrainInfo($event);
 		$cache_key = crc32($event->MasterEvent->Prefix . ':' . $constrain . ':' . $joins);
 
 		if ( !isset($del[$cache_key]) ) {
 			$del[$cache_key] = Array (
 				'prefix' => $event->MasterEvent->Prefix,
 				'constrain' => $constrain,
 				'joins' => $joins,
 			);
 
 			$this->Application->StoreVar('priority_deleted' . $this->Application->GetVar('m_wid'), serialize($del));
 		}
 	}
 
 	/**
 	 * Called before script shut-down and recalculate all deleted prefixes, to avoid recalculation on each deleted item
 	 *
 	 * @param kEvent $event
 	 */
 	function OnBeforeShutDown($event)
 	{
 		$del = $this->Application->RecallVar('priority_deleted'.$this->Application->GetVar('m_wid'));
 		$del = $del ? unserialize($del) : array();
 
+		/** @var kPriorityHelper $priority_helper */
 		$priority_helper = $this->Application->recallObject('PriorityHelper');
-		/* @var $priority_helper kPriorityHelper */
 
 		foreach ($del as $del_info) {
 			$dummy_event = new kEvent($del_info['prefix'] . ':OnDummy');
 			$ids = $priority_helper->recalculatePriorities($dummy_event, $del_info['constrain'], $del_info['joins']);
 
 			if ($ids) {
 				$priority_helper->massUpdateChanged($del_info['prefix'], $ids);
 			}
 		}
 
 		$this->Application->RemoveVar('priority_deleted'.$this->Application->GetVar('m_wid'));
 	}
 
 	/**
 	 * Enter description here...
 	 *
 	 * @param kEvent $event
 	 */
 	function OnSaveItems($event)
 	{
 		$tmp = $this->Application->RecallVar('priority_changes'.$this->Application->GetVar('m_wid'));
 		$changes = $tmp ? unserialize($tmp) : array();
 
+		/** @var kPriorityHelper $priority_helper */
 		$priority_helper = $this->Application->recallObject('PriorityHelper');
-		/* @var $priority_helper kPriorityHelper */
 
 		list ($constrain, $joins) = $this->getConstrainInfo($event);
 		$ids = $priority_helper->updatePriorities($event->MasterEvent, $changes, Array (0 => $event->MasterEvent->getEventParam('ids')), $constrain, $joins);
 
 		if ($ids) {
 			$priority_helper->massUpdateChanged($event->MasterEvent->Prefix, $ids);
 		}
 	}
 
 	function OnItemCreate($event)
 	{
 		$object = $event->MasterEvent->getObject();
 		/* @var $object kDBItem */
 
 		if ($object->GetDBField('Priority') == 0) {
+			/** @var kPriorityHelper $priority_helper */
 			$priority_helper = $this->Application->recallObject('PriorityHelper');
-			/* @var $priority_helper kPriorityHelper */
 
 			list ($constrain, $joins) = $this->getConstrainInfo($event);
 			$priority_helper->preparePriorities($event->MasterEvent, true, $constrain, $joins);
 		}
 	}
 
 	/**
 	 * Processes OnMassMoveUp, OnMassMoveDown events
 	 *
 	 * @param kEvent $event
 	 */
 	function OnChangePriority($event)
 	{
 		$prefix = $this->Application->GetVar('priority_prefix');
 		$dummy_event = new kEvent($prefix . ':OnDummy');
 
 		$ids = $this->StoreSelectedIDs($dummy_event);
 
 		if ($ids) {
 			$config = $this->Application->getUnitConfig($prefix);
 			$id_field = $config->getIDField();
 			$table_name = $config->getTableName();
 
 			if ( $this->Application->IsTempMode($prefix) ) {
 				$table_name = $this->Application->GetTempName($table_name, 'prefix:' . $prefix);
 			}
 
 			$sql = 'SELECT Priority, '.$id_field.'
 					FROM '.$table_name.'
 					WHERE '.$id_field.' IN ('.implode(',', $ids).') ORDER BY Priority DESC';
 			$priorities = $this->Conn->GetCol($sql, $id_field);
 
+			/** @var kPriorityHelper $priority_helper */
 			$priority_helper = $this->Application->recallObject('PriorityHelper');
-			/* @var $priority_helper kPriorityHelper */
 
 			list ($constrain, $joins) = $this->getConstrainInfo($event);
 
 			$sql = 'SELECT IFNULL(MIN(item_table.Priority), -1)
 					FROM '.$table_name . ' item_table
 					' . $joins;
 
 			if ( $constrain ) {
 				$sql .= ' WHERE ' . $priority_helper->normalizeConstrain($constrain);
 			}
 
 			$min_priority = $this->Conn->GetOne($sql);
 
 			foreach ($ids as $id) {
 				$new_priority = $priorities[$id] + ($event->Name == 'OnMassMoveUp' ? +1 : -1);
 				if ($new_priority > -1 || $new_priority < $min_priority) {
 					continue;
 				}
 
 				$changes = Array (
 					$id	=>	Array ('old' => $priorities[$id], 'new' => $new_priority),
 				);
 
 				if ($constrain) {
 					$changes[$id]['constrain'] = $constrain;
 				}
 
 				$sql = 'UPDATE '.$table_name.'
 						SET Priority = '.$new_priority.'
 						WHERE '.$id_field.' = '.$id;
 				$this->Conn->Query($sql);
 
 				$ids = $priority_helper->updatePriorities($dummy_event, $changes, Array ($id => $id), $constrain, $joins);
 
 				if ($ids) {
 					$priority_helper->massUpdateChanged($prefix, $ids);
 				}
 			}
 		}
 
 		$this->clearSelectedIDs($dummy_event);
 	}
 
 	/**
 	 * Completely recalculates priorities in current category
 	 *
 	 * @param kEvent $event
 	 */
 	function OnRecalculatePriorities($event)
 	{
+		/** @var kPriorityHelper $priority_helper */
 		$priority_helper = $this->Application->recallObject('PriorityHelper');
-		/* @var $priority_helper kPriorityHelper */
 
 		$prefix = $this->Application->GetVar('priority_prefix');
 		$dummy_event = new kEvent($prefix . ':Dummy');
 
 		list ($constrain, $joins) = $this->getConstrainInfo($event);
 		$ids = $priority_helper->recalculatePriorities($dummy_event, $constrain, $joins);
 
 		if ($ids) {
 			$priority_helper->massUpdateChanged($prefix, $ids);
 		}
 	}
 
 	/**
 	 * Returns constrain for current priority calculations
 	 *
 	 * @param kEvent $event
 	 * @return Array
 	 */
 	function getConstrainInfo($event)
 	{
 		$constrain_event = new kEvent($event->MasterEvent->getPrefixSpecial() . ':OnGetConstrainInfo');
 		$constrain_event->setEventParam('actual_event', $event->Name);
 		$constrain_event->setEventParam('original_special', $event->MasterEvent->Special);
 		$constrain_event->setEventParam('original_event', $event->MasterEvent->Name);
 		$this->Application->HandleEvent($constrain_event);
 
 		return $constrain_event->getEventParam('constrain_info');
 	}
 }
Index: branches/5.3.x/core/units/visits/visits_tag_processor.php
===================================================================
--- branches/5.3.x/core/units/visits/visits_tag_processor.php	(revision 16518)
+++ branches/5.3.x/core/units/visits/visits_tag_processor.php	(revision 16519)
@@ -1,182 +1,182 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class VisitsTagProcessor extends kDBTagProcessor {
 
 		function UserFound($params)
 		{
 			$virtual_users = Array(USER_ROOT, USER_GUEST, 0);
 
+			/** @var kDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBItem */
 
 			return !in_array( $object->GetDBField( $params['user_field'] ) , $virtual_users );
 		}
 
 		/**
 		 * Returns link for user editing
 		 *
 		 * @param Array $params
 		 *
 		 * @return string
 		 * @access protected
 		 */
 		protected function UserLink($params)
 		{
+			/** @var kDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBItem */
 
 			$user_id = $object->GetDBField( $params['user_field'] );
 
 			if (!$user_id) {
 				return '';
 			}
 
 			$url_params =  Array (
 				'm_opener' => 'd',
 				'u_mode' => 't',
 				'u_event' => 'OnEdit',
 				'u_id' => $user_id,
 				'pass' => 'all,u'
 			);
 
 			return $this->Application->HREF($params['edit_template'], '', $url_params);
 		}
 
 		function getDateLimitClause($field)
 		{
 			$search_filter = $this->Application->RecallVar( $this->getPrefixSpecial().'_search_filter');
 			if($search_filter)
 			{
 				$search_filter = unserialize($search_filter);
 				return $search_filter[$field]['value'];
 			}
 			return '';
 		}
 
 		function AffiliateOrderInfo($params)
 		{
 			$list =& $this->GetList($params);
 
 			$date_limit = str_replace($list->TableName, 'vis', $this->getDateLimitClause('VisitDate') );
 
 			$affiliates_config = $this->Application->getUnitConfig('affil');
 
 			$sql = 'SELECT '. $affiliates_config->getIDField() .'
 					FROM '. $affiliates_config->getTableName() .'
 					WHERE PortalUserId = '.$this->Application->RecallVar('user_id');
 			$affiliate_id = $this->Conn->GetOne($sql);
 
 			$sql = 'SELECT COUNT(ord.OrderId) AS OrderCount
 					FROM '.$list->TableName.' vis
 					LEFT JOIN '.TABLE_PREFIX.'Orders ord ON ord.VisitId = vis.VisitId
 					WHERE (vis.AffiliateId = '.$affiliate_id.') AND (ord.Status = '.ORDER_STATUS_PROCESSED.')'.($date_limit ? ' AND '.$date_limit : '');
 
 			$result = $this->Conn->GetRow($sql);
 
 			$sql = 'SELECT COUNT(*) FROM '.$list->TableName.' vis
 					WHERE AffiliateId = '.$affiliate_id.($date_limit ? ' AND '.$date_limit : '');
 
 			$result['TotalVisitors'] = $this->Conn->GetOne($sql);
 			$result['OrderTotalAmount'] = $list->getTotal('OrderTotalAmount', 'SUM');
 			$result['OrderAffiliateCommission'] = $list->getTotal('OrderAffiliateCommission', 'SUM');
 
 			$block_params = $this->prepareTagParams($params);
 			$block_params['name'] = $params['render_as'];
 
 			$format_fields = Array('OrderTotalAmount', 'OrderAffiliateCommission');
 
 			if (array_key_exists('currency', $params) && $params['currency']) {
 				$iso = $this->GetISO($params['currency']);
 				foreach($format_fields as $format_field)
 				{
 					$format = $list->GetFieldOption($format_field, 'format');
 					$value = sprintf($format, $result[$format_field]);
 					$value = $this->ConvertCurrency($value, $iso);
 					$value = $this->AddCurrencySymbol($value, $iso);
 					$result[$format_field] = $value;
 				}
 			}
 
 			$block_params = array_merge($block_params, $result);
 
 			return $this->Application->ParseBlock($block_params);
 		}
 
 		function ListVisitors($params)
 		{
 			$o = '';
 
 			$params['render_as'] = $params['item_render_as'];
 
 			$o_visitors = $this->PrintList2($params);
 
 			if($o_visitors)
 			{
 				$header = '';
 				$footer = '';
 
 				$block_params = $this->prepareTagParams($params);
 
 				$header_block = getArrayValue($params, 'header_render_as');
 				if($header_block)
 				{
 					$block_params['name'] = $header_block;
 					$header = $this->Application->ParseBlock($block_params);
 				}
 
 				$footer_block = getArrayValue($params, 'footer_render_as');
 				if($footer_block)
 				{
 					$block_params['name'] = $footer_block;
 					$footer = $this->Application->ParseBlock($block_params);
 				}
 
 				$o = $header.$o_visitors.$footer;
 			}
 			else
 			{
 				$visitors_params = array('name' => $params['empty_myvisitors_render_as']);
 				$o = $this->Application->ParseBlock($visitors_params);
 			}
 
 			return $o;
 
 		}
 
 		/**
 		 * Enter description here...
 		 *
 		 * @param string $params
 		 * @return kDBList
 		 */
 		function &GetList($params)
 		{
 			$list_name = array_key_exists('list_name', $params) ? $params['list_name'] : '';
 
 			if ( !$list_name ) {
 				$list_name = $this->Application->Parser->GetParam('list_name');
 			}
 
 			$types = $this->SelectParam($params, 'types');
 
 			if ( $types == 'myvisitororders' || $types == 'myvisitors' ) {
 				$this->nameToSpecialMapping[$list_name] = 'incommerce';
 			}
 
 			return parent::GetList($params);
 		}
 	}
Index: branches/5.3.x/core/units/visits/visits_event_handler.php
===================================================================
--- branches/5.3.x/core/units/visits/visits_event_handler.php	(revision 16518)
+++ branches/5.3.x/core/units/visits/visits_event_handler.php	(revision 16519)
@@ -1,143 +1,143 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class VisitsEventHandler extends kDBEventHandler {
 
 		/**
 		 * Allows to override standard permission mapping
 		 *
 		 * @return void
 		 * @access protected
 		 * @see kEventHandler::$permMapping
 		 */
 		protected function mapPermissions()
 		{
 			parent::mapPermissions();
 
 			$permissions = Array (
 				'OnItemBuild' => Array ('self' => true),
 			);
 
 			$this->permMapping = array_merge($this->permMapping, $permissions);
 		}
 
 		/**
 		 * Registers user visit to site
 		 *
 		 * @param kEvent $event
 		 *
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnRegisterVisit($event)
 		{
 			if ( $this->Application->isAdmin || !$this->Application->ConfigValue('UseVisitorTracking') || $this->Application->RecallVar('visit_id') ) {
 				// admin logins are not registered in visits list
 				return ;
 			}
 
+			/** @var kDBItem $object */
 			$object = $event->getObject(Array ('skip_autoload' => true));
-			/* @var $object kDBItem */
 
 			$object->SetDBField('VisitDate_date', time());
 			$object->SetDBField('VisitDate_time', time());
 			$object->SetDBField('Referer', getArrayValue($_SERVER, 'HTTP_REFERER'));
 			$object->SetDBField('IPAddress', $this->Application->getClientIp());
 
 			if ( $object->Create() ) {
 				$this->Application->StoreVar('visit_id', $object->GetID());
 				$this->Application->SetVar('visits_id', $object->GetID());
 			}
 		}
 
 		/**
 		 * Apply any custom changes to list's sql query
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
 		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			$types = $event->getEventParam('types');
 
 			if ( $types == 'myvisitors' ) {
 				$user_id = $this->Application->RecallVar('user_id');
 				$object->addFilter('myitems_user1', 'au.PortalUserId = ' . $user_id);
 				$object->addFilter('myitems_user2', 'au.PortalUserId >0');
 				//$object->AddGroupByField('VisitDate');
 				$object->AddGroupByField('%1$s.VisitId');
 			}
 
 			if ( $types == 'myvisitororders' && $event->Special == 'incommerce' ) {
 				$user_id = $this->Application->RecallVar('user_id');
 				$object->addFilter('myitems_orders', 'ord.OrderId IS NOT NULL');
 				$object->addFilter('myitems_user1', 'au.PortalUserId = ' . $user_id);
 				$object->addFilter('myitems_user2', 'au.PortalUserId >0');
 				$object->addFilter('myitems_orders_processed', 'ord.Status = 4');
 			}
 		}
 
 		/**
 		 * Apply some special processing to object being
 		 * recalled before using it in other events that
 		 * call prepareObject
 		 *
 		 * @param kDBItem|kDBList $object
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function prepareObject(&$object, kEvent $event)
 		{
 			$types = $event->getEventParam('types');
 
 			if ( method_exists($object, 'AddGroupByField') ) {
 				if ( (!$types || $types == 'myvisitors') && $object->Special == 'incommerce' ) {
 					$object->addCalculatedField('OrderTotalAmountSum', 'SUM(IF(ord.Status = 4, ord.SubTotal+ord.ShippingCost+ord.VAT, 0))');
 					$object->addCalculatedField('OrderAffiliateCommissionSum', 'SUM( IF(ord.Status = 4,ord.AffiliateCommission,0))');
 					$object->addCalculatedField('OrderCountByVisit', 'SUM( IF(ord.Status = 4, 1, 0) )');
 				}
 
 				if ( !$types ) {
 					$object->AddGroupByField('%1$s.VisitId');
 				}
 			}
 		}
 
 		/**
 		 * [HOOK] Updates user_id in current visit
 		 *
 		 * @param kEvent $event
 		 */
 		function OnUserLogin($event)
 		{
 			if ($event->MasterEvent->status == kEvent::erSUCCESS) {
 				$user_id = $this->Application->RecallVar('user_id');
 				if ($user_id > 0) {
 					// for real users only, not root,guest
 					$this->Application->setVisitField('PortalUserId', $user_id);
 				}
 			}
 		}
 
 	}
\ No newline at end of file
Index: branches/5.3.x/core/units/thesaurus/thesaurus_eh.php
===================================================================
--- branches/5.3.x/core/units/thesaurus/thesaurus_eh.php	(revision 16518)
+++ branches/5.3.x/core/units/thesaurus/thesaurus_eh.php	(revision 16519)
@@ -1,39 +1,39 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class ThesaurusEventHandler extends kDBEventHandler {
 
 		/**
 		 * Shows only thesaurus terms, that matches searched keywords
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
 		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			if ( !$this->Application->isAdminUser ) {
 				$keywords = $this->Application->unescapeRequestVariable(trim($this->Application->GetVar('keywords')));
 				$object->addFilter('search_filter', '%1$s.SearchTerm LIKE ' . $this->Conn->qstr($keywords) . ' OR %1$s.SearchTerm LIKE ' . $this->Conn->qstr($keywords . '_'));
 			}
 		}
 	}
Index: branches/5.3.x/core/units/thesaurus/thesaurus_tp.php
===================================================================
--- branches/5.3.x/core/units/thesaurus/thesaurus_tp.php	(revision 16518)
+++ branches/5.3.x/core/units/thesaurus/thesaurus_tp.php	(revision 16519)
@@ -1,96 +1,96 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class ThesaurusTagProcessor extends kDBTagProcessor {
 
 		function SubSearchLink($params)
 		{
+			/** @var kDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBItem */
 
 			$params['search_type'] = 'subsearch';
 			$params['keywords'] = $object->GetDBField('ThesaurusTerm');
 			$params['narrow_search'] = 1;
 
 			return $this->Application->ProcessParsedTag('m', 'Link', $params);
 		}
 
 		function _getThesaurusRecords()
 		{
 			$keywords = $this->Application->unescapeRequestVariable(trim($this->Application->GetVar('keywords')));
 			$table_name = $this->getUnitConfig()->getTableName();
 
 			$sql = 'SELECT *
 					FROM ' . $table_name . '
 					WHERE SearchTerm LIKE ' . $this->Conn->qstr($keywords).' OR SearchTerm LIKE ' . $this->Conn->qstr($keywords . '_');
 			$records = $this->Conn->Query($sql);
 
 			$new_records = Array ();
 			foreach ($records as $record) {
 				if ($record['ThesaurusType'] == THESAURUS_TYPE_USE) {
 					// expand in global scope
 					$sql = 'SELECT *
 							FROM ' . $table_name . '
 							WHERE SearchTerm = ' . $this->Conn->qstr($record['ThesaurusTerm']);
 					$use_records = $this->Conn->Query($sql);
 					if ($use_records) {
 						$new_records = array_merge($new_records, $use_records);
 					}
 				}
 
 				$new_records[] = $record;
 			}
 
 			usort($new_records, Array (&$this, '_sortThesaurus'));
 			ksort($new_records);
 
 			return $new_records;
 		}
 
 		function HasThesaurus($params)
 		{
 			$new_records = $this->_getThesaurusRecords();
 			return count($new_records) > 0;
 		}
 
 		function PrintThesaurus($params)
 		{
 			$new_records = $this->_getThesaurusRecords();
 
 			$ret = '';
 			$block_params = $this->prepareTagParams($params);
 			$block_params['name'] = $params['render_as'];
 			foreach ($new_records as $record) {
 				$block_params['term'] = $record['ThesaurusTerm'];
 
 				$url_params = Array (
 					'search_type' => 'subsearch',
 					'keywords' => $record['ThesaurusTerm'],
 					'narrow_search' => 1,
 				);
 				$block_params['url'] = $this->Application->ProcessParsedTag('m', 'Link', $url_params);
 
 				$ret .= $this->Application->ParseBlock($block_params);
 			}
 
 			return $ret;
 		}
 
 		function _sortThesaurus($record_a, $record_b)
 		{
 			return strcmp(strtolower($record_a['ThesaurusTerm']), strtolower($record_b['ThesaurusTerm']));
 		}
 	}
Index: branches/5.3.x/core/units/theme_files/theme_file_eh.php
===================================================================
--- branches/5.3.x/core/units/theme_files/theme_file_eh.php	(revision 16518)
+++ branches/5.3.x/core/units/theme_files/theme_file_eh.php	(revision 16519)
@@ -1,234 +1,234 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class ThemeFileEventHandler extends kDBEventHandler {
 
 		/**
 		 * Allows to override standard permission mapping
 		 *
 		 * @return void
 		 * @access protected
 		 * @see kEventHandler::$permMapping
 		 */
 		protected function mapPermissions()
 		{
 			parent::mapPermissions();
 
 			$permissions = Array (
 				'OnLoadBlock' => Array ('subitem' => true),
 				'OnSaveBlock' => Array ('subitem' => true),
 				'OnSaveLayout' => Array ('subitem' => true),
 			);
 
 			$this->permMapping = array_merge($this->permMapping, $permissions);
 		}
 
 		/**
 		 * Checks user permission to execute given $event
 		 *
 		 * @param kEvent $event
 		 * @return bool
 		 * @access public
 		 */
 		public function CheckPermission(kEvent $event)
 		{
 			if ( $event->Name == 'OnLoadBlock' || $event->Name == 'OnSaveBlock' ) {
 				return $this->Application->isAdminUser;
 			}
 
 			return parent::CheckPermission($event);
 		}
 
 		/**
 		 * Loads template contents into virtual field
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemLoad(kEvent $event)
 		{
 			parent::OnAfterItemLoad($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$filename = $this->_getTemplatePath($object);
 
 			if ( file_exists($filename) ) {
 				$object->SetDBField('FileContents', file_get_contents($filename));
 			}
 			else {
 				$object->SetError('FileContents', 'template_file_missing', 'la_error_TemplateFileMissing');
 			}
 		}
 
 		/**
 		 * Trim contents of edited template
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemUpdate(kEvent $event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$file_data = $object->GetDBField('FileContents');
 
 			$file_data = str_replace("\r\n", "\n", $file_data);
 			$file_data = str_replace("\r", "\n", $file_data);
 
 			$object->SetDBField('FileContents', trim($file_data));
 		}
 
 		/**
 		 * Saves updated content to template
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemUpdate(kEvent $event)
 		{
 			parent::OnAfterItemUpdate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$filename = $this->_getTemplatePath($object);
 
 			if ( file_exists($filename) && is_writable($filename) ) {
 				$fp = fopen($filename, 'w');
 				fwrite($fp, $object->GetDBField('FileContents'));
 				fclose($fp);
 
+				/** @var kThemesHelper $themes_helper */
 				$themes_helper = $this->Application->recallObject('ThemesHelper');
-				/* @var $themes_helper kThemesHelper */
 
 				$meta_info = $themes_helper->parseTemplateMetaInfo($filename);
 				$file_description = array_key_exists('desc', $meta_info) ? $meta_info['desc'] : '';
 
 				$object->SetDBField('Description', $file_description);
 				$object->SetDBField('FileMetaInfo', serialize($meta_info));
 				$object->Update();
 			}
 		}
 
 		/**
 		 * Returns full path to template file
 		 *
 		 * @param kDBItem $object
 		 * @return string
 		 */
 		function _getTemplatePath(&$object)
 		{
+			/** @var kDBItem $theme */
 			$theme = $this->Application->recallObject('theme');
-			/* @var $theme kDBItem */
 
 			$path = FULL_PATH . '/themes/' . $theme->GetDBField('Name');
 
 			$path .= $object->GetDBField('FilePath') . '/' . $object->GetDBField('FileName');
 
 			return $path;
 		}
 
 		/**
 		 * Loads block data based on it's name in request
 		 *
 		 * @param kEvent $event
 		 */
 		function OnLoadBlock($event)
 		{
 			parent::OnNew($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
+			/** @var TemplateHelper $template_helper */
 			$template_helper = $this->Application->recallObject('TemplateHelper');
-			/* @var $template_helper TemplateHelper */
 
 			$template_helper->InitHelper($object);
 
 			$object->SetDBField('FileName', $template_helper->blockInfo('template_file'));
 			$object->SetDBField('BlockPosition', $template_helper->blockInfo('start_pos') . ' - ' . $template_helper->blockInfo('end_pos'));
 			$object->SetDBField('FileContents', $template_helper->blockInfo('content'));
 
 		}
 
 		/**
 		 * Saves changed template block
 		 *
 		 * @param kEvent $event
 		 */
 		function OnSaveBlock($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject( Array('skip_autoload' => true) );
-			/* @var $object kDBItem */
 
 			$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
 			if ($items_info) {
 				list ($id, $field_values) = each($items_info);
 				$object->setID($id);
 				$object->SetFieldsFromHash($field_values);
 				$event->setEventParam('form_data', $field_values);
 			}
 
 			$status = $object->Validate();
 
+			/** @var TemplateHelper $template_helper */
 			$template_helper = $this->Application->recallObject('TemplateHelper');
-			/* @var $template_helper TemplateHelper */
 
 			$template_helper->InitHelper($object);
 
 			$status = $status && $template_helper->saveBlock($object);
 
 			if ($status) {
 				$event->SetRedirectParam('opener', 'u');
 			}
 			else {
 				$event->status = kEvent::erFAIL;
 			}
 		}
 
 		/**
 		 * Saves layout on given template
 		 *
 		 * @param kEvent $event
 		 */
 		function OnSaveLayout($event)
 		{
 			$event->status = kEvent::erSTOP;
 			if (($this->Application->GetVar('ajax') != 'yes') || (EDITING_MODE != EDITING_MODE_DESIGN)) {
 				return ;
 			}
 
 			$target_order = $this->Application->GetVar('target_order');
 
+			/** @var TemplateHelper $template_helper */
 			$template_helper = $this->Application->recallObject('TemplateHelper');
-			/* @var $template_helper TemplateHelper */
 
 			if ($template_helper->moveTemplateElements($target_order)) {
 				echo 'OK';
 				return ;
 			}
 
 			echo 'FAILED';
 		}
 	}
Index: branches/5.3.x/core/units/categories/categories_tag_processor.php
===================================================================
--- branches/5.3.x/core/units/categories/categories_tag_processor.php	(revision 16518)
+++ branches/5.3.x/core/units/categories/categories_tag_processor.php	(revision 16519)
@@ -1,2312 +1,2313 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class CategoriesTagProcessor extends kDBTagProcessor {
 
 	function SubCatCount($params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		if ( isset($params['today']) && $params['today'] ) {
 			$sql = 'SELECT COUNT(*)
 					FROM ' . $object->TableName . '
 					WHERE (ParentPath LIKE "' . $object->GetDBField('ParentPath') . '%") AND (CreatedOn > ' . (time() - 86400) . ')';
 			return $this->Conn->GetOne($sql) - 1;
 		}
 
 		return $object->GetDBField('CachedDescendantCatsQty');
 	}
 
 	/**
 	 * Returns category count in system
 	 *
 	 * @param Array $params
 	 * @return int
 	 */
 	function CategoryCount($params)
 	{
+		/** @var kCountHelper $count_helper */
 		$count_helper = $this->Application->recallObject('CountHelper');
-		/* @var $count_helper kCountHelper */
 
 		$today_only = isset($params['today']) && $params['today'];
 		return $count_helper->CategoryCount($today_only);
 	}
 
 	function IsNew($params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		return $object->GetDBField('IsNew') ? 1 : 0;
 	}
 
 	function IsPick($params)
 	{
 		return $this->IsEditorsPick($params);
 	}
 
 	/**
 	 * Returns item's editors pick status (using not formatted value)
 	 *
 	 * @param Array $params
 	 * @return bool
 	 */
 	function IsEditorsPick($params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		return $object->GetDBField('EditorsPick') == 1;
 	}
 
 	function ItemIcon($params)
 	{
 		$grid = $this->getUnitConfig()->getGridByName($params['grid']);
 
 		if ( !array_key_exists('Icons', $grid) ) {
 			return '';
 		}
 
 		$icons = $grid['Icons'];
 		$icon_prefix = array_key_exists('icon_prefix', $params) ? $params['icon_prefix'] : 'icon16_';
 
 		if ( array_key_exists('name', $params) ) {
 			$icon_name = $params['name'];
 
 			return array_key_exists($icon_name, $icons) ? $icons[$icon_name] : '';
 		}
 
+		/** @var kDBList $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBList */
 
 		if ( $object->GetDBField('ThemeId') > 0 ) {
 			if ( !$object->GetDBField('IsMenu') ) {
 				return $icon_prefix . 'section_menuhidden_system.png';
 			}
 
 			return $icon_prefix . 'section_system.png';
 		}
 
 		$status = $object->GetDBField('Status');
 
 		if ( $status == STATUS_DISABLED ) {
 			return $icon_prefix . 'section_disabled.png';
 		}
 
 		if ( !$object->GetDBField('IsMenu') ) {
 			return $icon_prefix . 'section_menuhidden.png';
 		}
 
 		if ( $status == STATUS_PENDING ) {
 			return $icon_prefix . 'section_pending.png';
 		}
 
 		if ( $object->GetDBField('IsNew') && ($icon_prefix == 'icon16_') ) {
 			return $icon_prefix . 'section_new.png'; // show gris icon only in grids
 		}
 
 		return $icon_prefix . 'section.png';
 	}
 
 	function ItemCount($params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		$ci_table = $this->Application->getUnitConfig('ci')->getTableName();
 
 		$module_prefixes = implode(',', $this->Conn->qstrArray($this->_getModulePrefixes()));
 
 		$sql = 'SELECT COUNT(*)
 				FROM ' . $object->TableName . ' c
 				JOIN ' . $ci_table . ' ci ON c.CategoryId = ci.CategoryId
 				WHERE (c.TreeLeft BETWEEN ' . $object->GetDBField('TreeLeft') . ' AND ' . $object->GetDBField('TreeRight') . ') AND (ci.ItemPrefix IN (' . $module_prefixes . '))';
 
 		return $this->Conn->GetOne($sql);
 	}
 
 	function _getModulePrefixes()
 	{
 		$ret = Array ();
 
 		foreach ($this->Application->ModuleInfo as $module_info) {
 			$ret[] = $module_info['Var'];
 		}
 
 		return array_unique($ret);
 	}
 
 	function ListCategories($params)
 	{
 		return $this->PrintList2($params);
 	}
 
 	function RootCategoryName($params)
 	{
 		return $this->Application->ProcessParsedTag('m', 'RootCategoryName', $params);
 	}
 
 	function CheckModuleRoot($params)
 	{
 		$module_name = getArrayValue($params, 'module') ? $params['module'] : 'In-Commerce';
 		$module_root_cat = $this->Application->findModule('Name', $module_name, 'RootCat');
 
 		$additional_cats = $this->SelectParam($params, 'add_cats');
 		if ($additional_cats) {
 			$additional_cats = explode(',', $additional_cats);
 		}
 		else {
 			$additional_cats = array();
 		}
 
 		if ($this->Application->GetVar('m_cat_id') == $module_root_cat || in_array($this->Application->GetVar('m_cat_id'), $additional_cats)) {
 			$home_template = getArrayValue($params, 'home_template');
 
 			if ( !$home_template ) {
 				return;
 			}
 
 			$this->Application->Redirect($home_template, Array('pass'=>'all'));
 		};
 	}
 
 	function CategoryPath($params)
 	{
+		/** @var kNavigationBar $navigation_bar */
 		$navigation_bar = $this->Application->recallObject('kNavigationBar');
-		/* @var $navigation_bar kNavigationBar */
 
 		return $navigation_bar->build($params);
 	}
 
 	/**
 	 * Shows category path to specified category
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function FieldCategoryPath($params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		$field = $this->SelectParam($params, 'name,field');
 		$category_id = $object->GetDBField($field);
 
 		if ($category_id) {
 			$params['cat_id'] = $category_id;
 
+			/** @var kNavigationBar $navigation_bar */
 			$navigation_bar = $this->Application->recallObject('kNavigationBar');
-			/* @var $navigation_bar kNavigationBar */
 
 			return $navigation_bar->build($params);
 		}
 
 		return '';
 	}
 
 	function CurrentCategoryName($params)
 	{
+		/** @var kDBList $cat_object */
 		$cat_object = $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix.'_List');
-		/* @var $cat_object kDBList */
 
 		$sql = 'SELECT '.$this->getTitleField().'
 				FROM '.$cat_object->TableName.'
 				WHERE CategoryId = '.(int)$this->Application->GetVar('m_cat_id');
 		return $this->Conn->GetOne($sql);
 	}
 
 	/**
 	 * Returns current category name
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @todo Find where it's used
 	 */
 	function CurrentCategory($params)
 	{
 		return $this->CurrentCategoryName($params);
 	}
 
 	function getTitleField()
 	{
+		/** @var kMultiLanguage $ml_formatter */
 		$ml_formatter = $this->Application->recallObject('kMultiLanguage');
-		/* @var $ml_formatter kMultiLanguage */
 
 		return $ml_formatter->LangFieldName('Name');
 	}
 
 	/**
 	 * Returns symlinked category for given category
 	 *
 	 * @param int $category_id
 	 * @return int
 	 */
 	function getCategorySymLink($category_id)
 	{
 		if (!$category_id) {
 			// don't bother to get symlink for "Home" category
 			return $category_id;
 		}
 
 		$cache_key = 'category_symlinks[%CSerial%]';
 		$cache = $this->Application->getCache($cache_key);
 
 		if ($cache === false) {
 			$config = $this->getUnitConfig();
 			$id_field = $config->getIDField();
 			$table_name = $config->getTableName();
 
 			// get symlinked categories, that are not yet deleted
 			$this->Conn->nextQueryCachable = true;
 			$sql = 'SELECT c1.SymLinkCategoryId, c1.' . $id_field . '
 					FROM ' . $table_name . ' c1
 					JOIN ' . $table_name . ' c2 ON c1.SymLinkCategoryId = c2.' . $id_field;
 			$cache = $this->Conn->GetCol($sql, $id_field);
 
 			$this->Application->setCache($cache_key, $cache);
 		}
 
 		return array_key_exists($category_id, $cache) ? $cache[$category_id] : $category_id;
 	}
 
 	function CategoryLink($params)
 	{
 		$category_id = getArrayValue($params, 'cat_id');
 
 		if ( $category_id === false ) {
 			$category_id = $this->Application->GetVar($this->getPrefixSpecial() . '_id');
 		}
 
 		if ( "$category_id" == 'Root' ) {
 			$category_id = $this->Application->findModule('Name', $params['module'], 'RootCat');
 		}
 		elseif ( "$category_id" == 'current' ) {
 			$category_id = $this->Application->GetVar('m_cat_id');
 		}
 
 		if ( !array_key_exists('direct_link', $params) || !$params['direct_link'] ) {
 			$category_id = $this->getCategorySymLink((int)$category_id);
 		}
 		else {
 			unset($params['direct_link']);
 		}
 
 		$virtual_template = $this->Application->getVirtualPageTemplate($category_id);
 
 		if ( ($virtual_template !== false) && preg_match('/external:(.*)/', $virtual_template, $rets) ) {
 			// external url (return here, instead of always replacing $params['t'] for kApplication::HREF to find it)
 			return $rets[1];
 		}
 
 		unset($params['cat_id'], $params['module']);
 		$new_params = Array ('pass' => 'm', 'm_cat_id' => $category_id, 'pass_category' => 1);
 		$params = array_merge($params, $new_params);
 
 		return $this->Application->ProcessParsedTag('m', 't', $params);
 	}
 
 	function CategoryList($params)
 	{
 		//$object = $this->Application->recallObject( $this->getPrefixSpecial() , $this->Prefix.'_List', $params );
 		$object =& $this->GetList($params);
 
 		if ($object->GetRecordsCount() == 0)
 		{
 			if (isset($params['block_no_cats'])) {
 				$params['name'] = $params['block_no_cats'];
 				return $this->Application->ParseBlock($params);
 			}
 			else {
 				return '';
 			}
 		}
 
 		if (isset($params['block'])) {
 			return $this->PrintList($params);
 		}
 		else {
 			$params['block'] = $params['block_main'];
 			if (isset($params['block_row_start'])) {
 				$params['row_start_block'] = $params['block_row_start'];
 			}
 
 			if (isset($params['block_row_end'])) {
 				$params['row_end_block'] = $params['block_row_end'];
 			}
 			return $this->PrintList2($params);
 		}
 	}
 
 	function Meta($params)
 	{
 		$object = $this->Application->recallObject($this->Prefix); // .'.-item'
-		/* @var $object CategoriesItem */
+		/** @var CategoriesItem $object */
 
 		$meta_type = $params['name'];
 		if ($object->isLoaded()) {
 			// 1. get module prefix by current category
+			/** @var CategoryHelper $category_helper */
 			$category_helper = $this->Application->recallObject('CategoryHelper');
-			/* @var $category_helper CategoryHelper */
 
 			$category_path = explode('|', substr($object->GetDBField('ParentPath'), 1, -1));
 			$module_info = $category_helper->getCategoryModule($params, $category_path);
 
 			if ( $module_info ) {
 				// 2. get item template by current category & module prefix
+				/** @var kRewriteUrlProcessor $rewrite_processor */
 				$rewrite_processor = $this->Application->recallObject('kRewriteUrlProcessor');
-				/* @var $rewrite_processor kRewriteUrlProcessor */
 
 				$category_params = Array (
 					'CategoryId' => $object->GetID(),
 					'ParentPath' => $object->GetDBField('ParentPath'),
 				);
 
 				$item_template = $rewrite_processor->GetItemTemplate($category_params, $module_info['Var']);
 
 				if ($this->Application->GetVar('t') == $item_template) {
 					// we are located on item's details page
+					/** @var kCatDBItem $item */
 					$item = $this->Application->recallObject($module_info['Var']);
-					/* @var $item kCatDBItem */
 
 					// 3. get item's meta data
 					$value = $item->GetField('Meta'.$meta_type);
 					if ($value) {
 						return $value;
 					}
 				}
 
 				// 4. get category meta data
 				$value = $object->GetField('Meta'.$meta_type);
 				if ($value) {
 					return $value;
 				}
 			}
 		}
 
 		// 5. get default meta data
 		switch ($meta_type) {
 			case 'Description':
 				$config_name = 'Category_MetaDesc';
 				break;
 			case 'Keywords':
 				$config_name = 'Category_MetaKey';
 				break;
 		}
 
 		return $this->Application->ConfigValue($config_name);
 	}
 
 	function BuildListSpecial($params)
 	{
 		if (($this->Special != '') && !is_numeric($this->Special)) {
 			// When recursive category list is printed (like in sitemap), then special
 			// should be generated even if it's already present. Without it list on this
 			// level will erase list on previous level, because it will be stored in same object.
 			return $this->Special;
 		}
 
 		if ( isset($params['parent_cat_id']) ) {
 			$parent_cat_id = $params['parent_cat_id'];
 		}
 		else {
 			$parent_cat_id = $this->Application->GetVar($this->Prefix.'_id');
 			if (!$parent_cat_id) {
 				$parent_cat_id = $this->Application->GetVar('m_cat_id');
 			}
 			if (!$parent_cat_id) {
 				$parent_cat_id = 0;
 			}
 		}
 
 		$list_unique_key = $this->getUniqueListKey($params);
 		// check for "admin" variable, because we are parsing front-end template from admin when using template editor feature
 		if ($this->Application->GetVar('admin') || !$this->Application->isAdmin) {
 			// add parent category to special, when on Front-End,
 			// because there can be many category lists on same page
 			$list_unique_key .= $parent_cat_id;
 		}
 
 		if ($list_unique_key == '') {
 			return parent::BuildListSpecial($params);
 		}
 
 		return crc32($list_unique_key);
 	}
 
 	function IsCurrent($params)
 	{
 		$object = $this->getObject($params);
 		if ($object->GetID() == $this->Application->GetVar('m_cat_id')) {
 			return true;
 		}
 		else {
 			return false;
 		}
 	}
 
 	/**
 	 * Substitutes category in last template base on current category
 	 * This is required becasue when you navigate catalog using AJAX, last_template is not updated
 	 * but when you open item edit from catalog last_template is used to build opener_stack
 	 * So, if we don't substitute m_cat_id in last_template, after saving item we'll get redirected
 	 * to the first category we've opened, not the one we navigated to using AJAX
 	 *
 	 * @param Array $params
 	 */
 	function UpdateLastTemplate($params)
 	{
 		$category_id = $this->Application->GetVar('m_cat_id');
 
 		$wid = $this->Application->GetVar('m_wid');
 		list($index_file, $env) = explode('|', $this->Application->RecallVar(rtrim('last_template_'.$wid, '_')), 2);
 
 		$vars_backup = Array ();
 		$vars = $this->Application->processQueryString($env);
 
 		foreach ($vars as $var_name => $var_value) {
 			$vars_backup[$var_name] = $this->Application->GetVar($var_name);
 			$this->Application->SetVar($var_name, $var_value);
 		}
 
 		// update required fields
 		$this->Application->SetVar('m_cat_id', $category_id);
 		$this->Application->Session->SaveLastTemplate($params['template']);
 
 		foreach ($vars_backup as $var_name => $var_value) {
 			$this->Application->SetVar($var_name, $var_value);
 		}
 	}
 
 	function GetParentCategory($params)
 	{
 		$parent_id = $this->Application->getBaseCategory();
 		$category_id = $this->Application->GetVar('m_cat_id');
 
 		if ($category_id != $parent_id) {
 			$config = $this->getUnitConfig();
 
 			$sql = 'SELECT ParentId
 					FROM ' . $config->getTableName() . '
 					WHERE ' . $config->getIDField() . ' = ' . $category_id;
 			$parent_id = $this->Conn->GetOne($sql);
 		}
 
 		return $parent_id;
 	}
 
 	function InitCacheUpdater($params)
 	{
 		kUtil::safeDefine('CACHE_PERM_CHUNK_SIZE', 30);
 
 		$continue = $this->Application->GetVar('continue');
 		$total_cats = (int)$this->Conn->GetOne('SELECT COUNT(*) FROM ' . TABLE_PREFIX . 'Categories');
 
 		if ( $continue === false ) {
 			$rebuild_mode = $this->Application->ConfigValue('CategoryPermissionRebuildMode');
 
 			if ( $rebuild_mode == CategoryPermissionRebuild::AUTOMATIC && $total_cats > CACHE_PERM_CHUNK_SIZE ) {
 				// first step, if category count > CACHE_PERM_CHUNK_SIZE, then ask for cache update
 				return true;
 			}
 
 			// if we don't have to ask, then assume user selected "Yes" in permcache update dialog
 			$continue = 1;
 		}
 
+		/** @var kPermCacheUpdater $updater */
 		$updater = $this->Application->makeClass('kPermCacheUpdater', Array ($continue));
-		/* @var $updater kPermCacheUpdater */
 
 		if ( $continue === '0' ) { // No in dialog
 			$updater->clearData();
 			$this->Application->Redirect($params['destination_template']);
 		}
 
 		$ret = false; // don't ask for update
 
 		if ( $continue == 1 ) { // Initial run
 			$updater->setData();
 		}
 
 		if ( $continue == 2 ) { // Continuing
 			// called from AJAX request => returns percent
 			$needs_more = true;
 
 			while ( $needs_more && $updater->iteration <= CACHE_PERM_CHUNK_SIZE ) {
 				// until proceeded in this step category count exceeds category per step limit
 				$needs_more = $updater->DoTheJob();
 			}
 
 			if ( $needs_more ) {
 				// still some categories are left for next step
 				$updater->setData();
 			}
 			else {
 				// all done, update left tree and redirect
 				$updater->SaveData();
 
 				$this->Application->HandleEvent(new kEvent('c:OnResetCMSMenuCache'));
 
 				$this->Application->RemoveVar('PermCache_UpdateRequired');
 				$this->Application->StoreVar('RefreshStructureTree', 1);
 				$this->Application->Redirect($params['destination_template']);
 			}
 
 			$ret = $updater->getDonePercent();
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Parses warning block, but with style="display: none;". Used during permissions saving from AJAX
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function SaveWarning($params)
 	{
 		if ( $this->Prefix == 'st' ) {
 			// don't use this method for other prefixes then Categories, that use this tag processor
 			return parent::SaveWarning($params);
 		}
 
 		$main_prefix = getArrayValue($params, 'main_prefix');
 		if ( $main_prefix && $main_prefix != '$main_prefix' ) {
 			$top_prefix = $main_prefix;
 		}
 		else {
 			$top_prefix = $this->Application->GetTopmostPrefix($this->Prefix);
 		}
 
 		$temp_tables = substr($this->Application->GetVar($top_prefix . '_mode'), 0, 1) == 't';
 		$modified = $this->Application->RecallVar($top_prefix . '_modified');
 
 		if ( !$temp_tables ) {
 			$this->Application->RemoveVar($top_prefix . '_modified');
 			return '';
 		}
 
 		$block_name = $this->SelectParam($params, 'render_as,name');
 		if ( $block_name ) {
 			$block_params = $this->prepareTagParams($params);
 			$block_params['name'] = $block_name;
 			$block_params['edit_mode'] = $temp_tables ? 1 : 0;
 			$block_params['display'] = $temp_tables && $modified ? 1 : 0;
 			return $this->Application->ParseBlock($block_params);
 		}
 
 		return $temp_tables && $modified ? 1 : 0;
 	}
 
 	/**
 	 * Allows to detect if this prefix has something in clipboard
 	 *
 	 * @param Array $params
 	 * @return bool
 	 */
 	function HasClipboard($params)
 	{
 		$clipboard = $this->Application->RecallVar('clipboard');
 		if ($clipboard) {
 			$clipboard = unserialize($clipboard);
 			foreach ($clipboard as $prefix => $clipboard_data) {
 				foreach ($clipboard_data as $mode => $ids) {
 					if ( count($ids) ) {
 						return 1;
 					}
 				}
 			}
 		}
 		return 0;
 	}
 
 	/**
 	 * Allows to detect if root category being edited
 	 *
 	 * @param Array $params
 	 */
 	function IsRootCategory($params)
 	{
+		/** @var CategoriesItem $object */
 		$object = $this->getObject($params);
-		/* @var $object CategoriesItem */
 
 		return $object->IsRoot();
 	}
 
 	/**
 	 * Returns home category id
 	 *
 	 * @param Array $params
 	 * @return int
 	 */
 	function HomeCategory($params)
 	{
 		return $this->Application->getBaseCategory();
 	}
 
 	/**
 	 * Used for disabling "Home" and "Up" buttons in category list
 	 *
 	 * @param Array $params
 	 * @return bool
 	 */
 	function ModuleRootCategory($params)
 	{
 		return $this->Application->GetVar('m_cat_id') == $this->Application->getBaseCategory();
 	}
 
 	function CatalogItemCount($params)
 	{
 		$params['skip_quering'] = true;
 		$object =& $this->GetList($params);
 
 		return $object->GetRecordsCount(false) != $object->GetRecordsCount() ? $object->GetRecordsCount().' / '.$object->GetRecordsCount(false) : $object->GetRecordsCount();
 	}
 
 	function InitCatalog($params)
 	{
 		$tab_prefixes = $this->Application->GetVar('tp'); // {all, <prefixes_list>, none}
 		if ( $tab_prefixes === false ) {
 			$tab_prefixes = 'all';
 		}
 
 		$skip_prefixes = isset($params['skip_prefixes']) && $params['skip_prefixes'] ? explode(',', $params['skip_prefixes']) : Array();
 		$replace_main = isset($params['replace_m']) && $params['replace_m'];
 
 		// get all prefixes available
 		$prefixes = Array();
 		foreach ($this->Application->ModuleInfo as $module_name => $module_data) {
 			$prefix = $module_data['Var'];
 
 			if ( $prefix == 'adm' /* || $prefix == 'm'*/ ) {
 				continue;
 			}
 
 			if ($prefix == 'm' && $replace_main) {
 				$prefix = 'c';
 			}
 
 			$prefixes[] = $prefix;
 		}
 
 		if ($tab_prefixes == 'none') {
 			$skip_prefixes = array_unique(array_merge($skip_prefixes, $prefixes));
 			unset($skip_prefixes[ array_search($replace_main ? 'c' : 'm', $skip_prefixes) ]);
 		}
 		elseif ($tab_prefixes != 'all') {
 			// prefix list here
 			$tab_prefixes = explode(',', $tab_prefixes); // list of prefixes that should stay
 			$skip_prefixes = array_unique(array_merge($skip_prefixes, array_diff($prefixes, $tab_prefixes)));
 		}
 
 		$params['name'] = $params['render_as'];
 		$params['skip_prefixes'] = implode(',', $skip_prefixes);
 		return $this->Application->ParseBlock($params);
 	}
 
 	/**
 	 * Determines, that printed category/menu item is currently active (will also match parent category)
 	 *
 	 * @param Array $params
 	 * @return bool
 	 */
 	function IsActive($params)
 	{
 		static $current_path = null;
 
 		if ( !isset($current_path) ) {
 			$sql = 'SELECT ParentPath
 					FROM ' . TABLE_PREFIX . 'Categories
 					WHERE CategoryId = ' . (int)$this->Application->GetVar('m_cat_id');
 			$current_path = $this->Conn->GetOne($sql);
 		}
 
 		if ( array_key_exists('parent_path', $params) ) {
 			$test_path = $params['parent_path'];
 		}
 		else {
 			$template = isset($params['template']) ? $params['template'] : '';
 
 			if ( $template ) {
 				// when using from "c:CachedMenu" tag
 				$sql = 'SELECT ParentPath
 						FROM ' . TABLE_PREFIX . 'Categories
 						WHERE NamedParentPath = ' . $this->Conn->qstr('Content/' . $template);
 				$test_path = $this->Conn->GetOne($sql);
 			}
 			else {
 				// when using from "c:PrintList" tag
 				$cat_id = array_key_exists('cat_id', $params) && $params['cat_id'] ? $params['cat_id'] : false;
 				if ( $cat_id === false ) {
 					// category not supplied -> get current from PrintList
 					$category = $this->getObject($params);
 				}
 				else {
 					if ( "$cat_id" == 'Root' ) {
 						$cat_id = $this->Application->findModule('Name', $params['module'], 'RootCat');
 					}
 
+					/** @var CategoriesItem $category */
 					$category = $this->Application->recallObject($this->Prefix . '.-c' . $cat_id, $this->Prefix, Array ('skip_autoload' => true));
-					/* @var $category CategoriesItem */
 
 					$category->Load($cat_id);
 				}
 
 				$test_path = $category->GetDBField('ParentPath');
 			}
 		}
 
 		return strpos($current_path, $test_path) !== false;
 	}
 
 	/**
 	 * Checks if user have one of required permissions
 	 *
 	 * @param Array $params
 	 * @return bool
 	 */
 	function HasPermission($params)
 	{
+		/** @var kPermissionsHelper $perm_helper */
 		$perm_helper = $this->Application->recallObject('PermissionsHelper');
-		/* @var $perm_helper kPermissionsHelper */
 
 		$params['raise_warnings'] = 0;
+
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		$params['cat_id'] = $object->isLoaded() ? $object->GetDBField('ParentPath') : $this->Application->GetVar('m_cat_id');
 		return $perm_helper->TagPermissionCheck($params);
 	}
 
 	/**
 	 * Prepares name for field with event in it (used only on front-end)
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function SubmitName($params)
 	{
 		return 'events[' . $this->Prefix . '][' . $params['event'] . ']';
 	}
 
 	/**
 	 * Returns last modification date of items in category / system
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function LastUpdated($params)
 	{
 		$category_id = (int)$this->Application->GetVar('m_cat_id');
 		$local = array_key_exists('local', $params) && ($category_id > 0) ? $params['local'] : false;
 
 		$serial_name = $this->Application->incrementCacheSerial('c', $local ? $category_id : null, false);
 		$cache_key = 'category_last_updated[%' . $serial_name . '%]';
 
 		$row_data = $this->Application->getCache($cache_key);
 
 		if ( $row_data === false ) {
 			if ( $local && ($category_id > 0) ) {
 				// scan only current category & it's children
 				list ($tree_left, $tree_right) = $this->Application->getTreeIndex($category_id);
 
 				$sql = 'SELECT MAX(Modified) AS ModDate, MAX(CreatedOn) AS NewDate
 		        		FROM ' . TABLE_PREFIX . 'Categories
 		        		WHERE TreeLeft BETWEEN ' . $tree_left . ' AND ' . $tree_right;
 			}
 			else {
 				// scan all categories in system
 				$sql = 'SELECT MAX(Modified) AS ModDate, MAX(CreatedOn) AS NewDate
 		       			FROM ' . TABLE_PREFIX . 'Categories';
 			}
 
 			$this->Conn->nextQueryCachable = true;
 			$row_data = $this->Conn->GetRow($sql);
 			$this->Application->setCache($cache_key, $row_data);
 		}
 
 		if ( !$row_data ) {
 			return '';
 		}
 
 		$date = $row_data[$row_data['NewDate'] > $row_data['ModDate'] ? 'NewDate' : 'ModDate'];
 
 		// format date
 		$format = isset($params['format']) ? $params['format'] : '_regional_DateTimeFormat';
 
 		if ( preg_match("/_regional_(.*)/", $format, $regs) ) {
+			/** @var LanguagesItem $lang */
 			$lang = $this->Application->recallObject('lang.current');
-			/* @var $lang LanguagesItem */
 
 			if ( $regs[1] == 'DateTimeFormat' ) {
 				// combined format
 				$format = $lang->GetDBField('DateFormat') . ' ' . $lang->GetDBField('TimeFormat');
 			}
 			else {
 				// simple format
 				$format = $lang->GetDBField($regs[1]);
 			}
 		}
 
 		return date($format, $date);
 	}
 
 	function CategoryItemCount($params)
 	{
+		/** @var kDBList $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBList */
 
 		$params['cat_id'] = $object->GetID();
 
+		/** @var kCountHelper $count_helper */
 		$count_helper = $this->Application->recallObject('CountHelper');
-		/* @var $count_helper kCountHelper */
 
 		return $count_helper->CategoryItemCount($params['prefix'], $params);
 	}
 
 	/**
 	 * Returns prefix + any word (used for shared between categories per page settings)
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function VarName($params)
 	{
 		return $this->Prefix.'_'.$params['type'];
 	}
 
 	/**
 	 * Checks if current category is valid symbolic link to another category
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function IsCategorySymLink($params)
 	{
+		/** @var kDBList $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBList */
 
 		$sym_category_id = $object->GetDBField('SymLinkCategoryId');
 
 		if ( is_null($sym_category_id) ) {
 			return false;
 		}
 
 		$config = $this->getUnitConfig();
 		$id_field = $config->getIDField();
 		$table_name = $config->getTableName();
 
 		$sql = 'SELECT ' . $id_field . '
 				FROM ' . $table_name . '
 				WHERE ' . $id_field . ' = ' . $sym_category_id;
 
 		return $this->Conn->GetOne($sql) ? true : false;
 	}
 
 	/**
 	 * Builds link to a category in the Admin Tree.
 	 *
 	 * @param array $params Tag params.
 	 *
 	 * @return string
 	 */
 	protected function AdminTreeLink(array $params)
 	{
 		$params['direct_link'] = 1;
 		$params['pass'] = 'm';
 		$params['m_opener'] = 'r';
 
 		if ( $this->Application->ConfigValue('Catalog_PreselectModuleTab') ) {
 			$module_prefix = $this->GetModulePrefix($params);
 
 			if ( $module_prefix ) {
 				$params['anchor'] = 'tab-' . $module_prefix;
 			}
 		}
 
 		return $this->CategoryLink($params);
 	}
 
 	/**
 	 * Returns module prefix based on root category for given
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function GetModulePrefix($params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		$parent_path = explode('|', substr($object->GetDBField('ParentPath'), 1, -1));
 
+		/** @var CategoryHelper $category_helper */
 		$category_helper = $this->Application->recallObject('CategoryHelper');
-		/* @var $category_helper CategoryHelper */
 
 		$module_info = $category_helper->getCategoryModule($params, $parent_path);
 
 		return $module_info ? $module_info['Var'] : 'c';
 	}
 
 	function ImageSrc($params)
 	{
 		list ($ret, $tag_processed) = $this->processAggregatedTag('ImageSrc', $params, $this->getPrefixSpecial());
 		return $tag_processed ? $ret : false;
 	}
 
 	function PageLink($params)
 	{
 		$params['m_cat_page'] = $this->Application->GetVar($this->getPrefixSpecial() . '_Page');
 
 		return parent::PageLink($params);
 	}
 
 	/**
 	 * Returns spelling suggestions against search keyword
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function SpellingSuggestions($params)
 	{
 		$keywords = $this->Application->unescapeRequestVariable(trim($this->Application->GetVar('keywords')));
 		if ( !$keywords ) {
 			return '';
 		}
 
 		// 1. try to get already cached suggestion
 		$cache_key = 'search.suggestion[%SpellingDictionarySerial%]:' . $keywords;
 		$suggestion = $this->Application->getCache($cache_key);
 
 		if ( $suggestion !== false ) {
 			return $suggestion;
 		}
 
 		$table_name = $this->Application->getUnitConfig('spelling-dictionary')->getTableName();
 
 		// 2. search suggestion in database
 		$this->Conn->nextQueryCachable = true;
 		$sql = 'SELECT SuggestedCorrection
 				FROM ' . $table_name . '
 				WHERE MisspelledWord = ' . $this->Conn->qstr($keywords);
 		$suggestion = $this->Conn->GetOne($sql);
 
 		if ( $suggestion !== false ) {
 			$this->Application->setCache($cache_key, $suggestion);
 
 			return $suggestion;
 		}
 
 		// 3. suggestion not found in database, ask webservice
+		/** @var kCurlHelper $curl_helper */
 		$curl_helper = $this->Application->recallObject('CurlHelper');
-		/* @var $curl_helper kCurlHelper */
 
 		$curl_helper->SetRequestData(array(
 			'appid' => $this->Application->ConfigValue('YahooApplicationId'),
 			'query' => $keywords,
 		));
 
 		$xml_data = $curl_helper->Send('http://search.yahooapis.com/WebSearchService/V1/spellingSuggestion');
 
+		/** @var kXMLHelper $xml_helper */
 		$xml_helper = $this->Application->recallObject('kXMLHelper');
-		/* @var $xml_helper kXMLHelper */
 
+		/** @var kXMLNode $root_node */
 		$root_node =& $xml_helper->Parse($xml_data);
-		/* @var $root_node kXMLNode */
 
+		/** @var kXMLNode $result */
 		$result = $root_node->FindChild('RESULT');
-		/* @var $result kXMLNode */
 
 		if ( is_object($result) ) {
 			// webservice responded -> save in local database
 			$fields_hash = Array ('MisspelledWord' => $keywords, 'SuggestedCorrection' => $result->Data);
 
 			$this->Conn->doInsert($fields_hash, $table_name);
 			$this->Application->setCache($cache_key, $result->Data);
 
 			return $result->Data;
 		}
 
 		return '';
 	}
 
 	/**
 	 * Shows link for searching by suggested word
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function SuggestionLink($params)
 	{
 		$params['keywords'] = $this->SpellingSuggestions($params);
 
 		return $this->Application->ProcessParsedTag('m', 'Link', $params);
 	}
 
 	function InitCatalogTab($params)
 	{
 		$tab_params['mode'] = $this->Application->GetVar('tm'); // single/multi selection possible
 		$tab_params['special'] = $this->Application->GetVar('ts'); // use special for this tab
 		$tab_params['dependant'] = $this->Application->GetVar('td'); // is grid dependant on categories grid
 
 		// set default params (same as in catalog)
 		if ( $tab_params['mode'] === false ) {
 			$tab_params['mode'] = 'multi';
 		}
 
 		if ( $tab_params['special'] === false ) {
 			$tab_params['special'] = '';
 		}
 
 		if ( $tab_params['dependant'] === false ) {
 			$tab_params['dependant'] = 'yes';
 		}
 
 		// pass params to block with tab content
 		$params['name'] = $params['render_as'];
 		$special = $tab_params['special'] ? $tab_params['special'] : $this->Special;
 		$params['prefix'] = trim($this->Prefix.'.'.$special, '.');
 
 		$prefix_append = $this->Application->GetVar('prefix_append');
 		if ($prefix_append) {
 			$params['prefix'] .= $prefix_append;
 		}
 
 		$default_grid = array_key_exists('default_grid', $params) ? $params['default_grid'] : 'Default';
 		$radio_grid = array_key_exists('radio_grid', $params) ? $params['radio_grid'] : 'Radio';
 
 		$params['cat_prefix'] = trim('c.'.($tab_params['special'] ? $tab_params['special'] : $this->Special), '.');
 		$params['tab_mode'] = $tab_params['mode'];
 		$params['grid_name'] = ($tab_params['mode'] == 'multi') ? $default_grid : $radio_grid;
 		$params['tab_dependant'] = $tab_params['dependant'];
 		$params['show_category'] = $tab_params['special'] == 'showall' ? 1 : 0; // this is advanced view -> show category name
 
 		if ($special == 'showall' || $special == 'user') {
 			$params['grid_name'] .= 'ShowAll';
 		}
 
 		// use $pass_params to be able to pass 'tab_init' parameter from m_ModuleInclude tag
 		return $this->Application->ParseBlock($params, 1);
 	}
 
 	/**
 	 * Show CachedNavbar of current item primary category
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function CategoryName($params)
 	{
 		// show category cachednavbar of
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		$category_id = isset($params['cat_id']) ? $params['cat_id'] : $object->GetDBField('CategoryId');
 
 		$cache_key = 'category_paths[%CIDSerial:' . $category_id . '%][%PhrasesSerial%][Adm:' . (int)$this->Application->isAdmin . ']';
 		$category_path = $this->Application->getCache($cache_key);
 
 		if ($category_path === false) {
 			// not chached
 			if ($category_id > 0) {
 				$cached_navbar = $object->GetField('CachedNavbar');
 
 				if ($category_id == $object->GetDBField('ParentId')) {
 					// parent category cached navbar is one element smaller, then current ones
 					$cached_navbar = explode('&|&', $cached_navbar);
 					array_pop($cached_navbar);
 					$cached_navbar = implode('&|&', $cached_navbar);
 				}
 				else {
 					// no relation with current category object -> query from db
 					$language_id = (int)$this->Application->GetVar('m_lang');
 					if (!$language_id) {
 						$language_id = 1;
 					}
 
 					$sql = 'SELECT l' . $language_id . '_CachedNavbar
 							FROM ' . $object->TableName . '
 							WHERE ' . $object->IDField . ' = ' . $category_id;
 					$cached_navbar = $this->Conn->GetOne($sql);
 				}
 
 				$cached_navbar = preg_replace('/^(Content&\|&|Content)/i', '', $cached_navbar);
 
 				$category_path = trim($this->CategoryName( Array('cat_id' => 0) ).' > '.str_replace('&|&', ' > ', $cached_navbar), ' > ');
 			}
 			else {
 				$category_path = $this->Application->Phrase(($this->Application->isAdmin ? 'la_' : 'lu_') . 'rootcategory_name');
 			}
 
 			$this->Application->setCache($cache_key, $category_path);
 		}
 
 		return $category_path;
 	}
 
 	// structure related
 
 	/**
 	 * Returns page object based on requested params
 	 *
 	 * @param Array $params
 	 * @return CategoriesItem
 	 */
 	function &_getPage($params)
 	{
+		/** @var kDBItem $page */
 		$page = $this->Application->recallObject($this->Prefix . '.' . $this->_getPageSpecial($params), null, $params);
-		/* @var $page kDBItem */
 
 		// 1. load by given id
 		$page_id = array_key_exists('page_id', $params) ? $params['page_id'] : 0;
 
 		if ( $page_id ) {
 			if ( $page_id != $page->GetID() ) {
 				// load if different
 				$page->Load($page_id);
 			}
 
 			return $page;
 		}
 
 		// 2. load by template
 		$template = array_key_exists('page', $params) ? $params['page'] : '';
 
 		if ( !$template ) {
 			$template = $this->Application->GetVar('t');
 		}
 
 		// different path in structure AND design template differs from requested template
 		$structure_path_match = mb_strtolower($page->GetDBField('NamedParentPath')) == mb_strtolower('Content/' . $template);
 		$design_match = $page->GetDBField('CachedTemplate') == $template;
 
 		if ( !$structure_path_match && !$design_match ) {
 			// Same sql like in "c:getPassedID". Load, when current page object doesn't match requested page object
+			/** @var kThemesHelper $themes_helper */
 			$themes_helper = $this->Application->recallObject('ThemesHelper');
-			/* @var $themes_helper kThemesHelper */
 
 			$page_id = $themes_helper->getPageByTemplate($template);
 
 			$page->Load($page_id);
 		}
 
 		return $page;
 	}
 
 	/**
 	 * Returns unique special for each used page
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function _getPageSpecial($params)
 	{
 		$ret = Array ();
 		$page_id = array_key_exists('page_id', $params) ? $params['page_id'] : 0;
 		$template = array_key_exists('page', $params) ? $params['page'] : '';
 
 		if ( $page_id ) {
 			$ret[] = 'page_id=' . $page_id;
 		}
 
 		if ( $template ) {
 			$ret[] = 'page=' . $template;
 		}
 
 		return $ret ? '-virtual-' . kUtil::crc32(serialize($ret)) : '-virtual';
 	}
 
 	/**
 	 * Returns requested content block content of current or specified page
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function ContentBlock($params)
 	{
 		$num = getArrayValue($params, 'num');
 
 		if ( !$num ) {
 			$name = getArrayValue($params, 'name');
 
 			if ( $name ) {
 				$num = kUtil::crc32($name);
 			}
 		}
 
 		if ( !$num ) {
 			return 'NO CONTENT NUM SPECIFIED';
 		}
 
+		/** @var kDBItem $page */
 		$page =& $this->_getPage($params);
-		/* @var $page kDBItem */
 
 		if ( !$page->isLoaded() ) {
 			// page is not created yet => all blocks are empty
 			return '';
 		}
 
+		/** @var PageHelper $page_helper */
 		$page_helper = $this->Application->recallObject('PageHelper');
-		/* @var $page_helper PageHelper */
 
+		/** @var kDBItem $content */
 		$content = $this->Application->recallObject('content.-block', null, Array ('skip_autoload' => true));
-		/* @var $content kDBItem */
 
 		if ( !$page_helper->loadContentBlock($content, $page, $num) && EDITING_MODE ) {
 			$page_helper->createNewContentBlock($page->GetID(), $num);
 			$page_helper->loadContentBlock($content, $page, $num);
 		}
 
 		$edit_code_before = $edit_code_after = '';
 		$inline_editing = isset($params['mode']) && $params['mode'] == 'inline';
 
 		if ( EDITING_MODE == EDITING_MODE_CONTENT ) {
 			if ( $inline_editing ) {
 				$params['name'] = 'content_block_' . $num;
 
 				$editing_hint = $this->Application->Phrase('la_hint_ClickToEdit', false, true);
 
 				$edit_code_before = '
 					<div class="cms-edit-btn-container mode-inline-edit" data-content-id="' . $content->GetID() . '">
 						<div class="inline-edit-layer"></div>
 						<div class="inline-saving-layer"></div>
 						<div class="cms-btn-content" title="' . kUtil::escape($editing_hint, kUtil::ESCAPE_HTML) . '" contenteditable="true" id="' . kUtil::escape('content_block_' . $num, kUtil::ESCAPE_HTML) . '">';
 
 				$edit_code_after = '</div></div>' . $this->FCKEditor($params);
 			}
 			else {
 				$button_code = $this->Application->ProcessParsedTag($content->getPrefixSpecial(), 'AdminEditButton', $params);
 
 				$edit_code_before = '
 					<div class="cms-edit-btn-container">
 						' . $button_code . '
 						<div class="cms-btn-content">';
 
 				$edit_code_after = '</div></div>';
 			}
 		}
 
 		if ( $this->Application->GetVar('_editor_preview_') == 1 ) {
 			$data = $this->Application->RecallVar('_editor_preview_content_');
 		}
 		elseif ( EDITING_MODE == EDITING_MODE_CONTENT && $inline_editing ) {
 			// don't use formatter, that replaced "@@ID@@" links
 			$content->SetFieldOption('Content', 'using_fck', false);
 			$data = $content->GetField('Content');
 			$content->SetFieldOption('Content', 'using_fck', true);
 		}
 		else {
 			// use formatter, that replaced "@@ID@@" links
 			$data = $content->GetField('Content');
 		}
 
 		$data = $edit_code_before . $this->_transformContentBlockData($data, $params) . $edit_code_after;
 
 		if ( $data != '' ) {
 			$this->Application->Parser->DataExists = true;
 		}
 
 		return $data;
 	}
 
 	/**
 	 * Apply all kinds of content block data transformations without rewriting ContentBlock tag
 	 *
 	 * @param string $data
 	 * @param Array $params
 	 * @return string
 	 */
 	function _transformContentBlockData(&$data, $params)
 	{
 		return $data;
 	}
 
 	/**
 	 * Returns current page name or page based on page/page_id parameters
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @todo Used?
 	 */
 	function PageName($params)
 	{
 		$page =& $this->_getPage($params);
 
 		return $page->GetDBField('Name');
 	}
 
 	/**
 	 * Returns current/given page information
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function PageInfo($params)
 	{
 		$page =& $this->_getPage($params);
 
 		switch ($params['type']) {
 			case 'title':
 				// TODO: rename column to SectionTitle
 				$db_field = 'Name'; // "Section Title" - title to show on page (e.g. in <h1> tag)
 				break;
 
 			case 'htmlhead_title':
 				// TODO: rename column to HtmlTitle
 				$db_field = 'Title'; // "Title (on Page)" - in <title> html tag
 				break;
 
 			case 'meta_title':
 				$db_field = 'MetaTitle';
 				break;
 
 			case 'menu_title':
 				$db_field = 'MenuTitle'; // "Title (Menu Item)" - in menu and navigation bar
 				break;
 
 			case 'meta_keywords':
 				$db_field = 'MetaKeywords';
 				$cat_field = 'Keywords';
 				break;
 
 			case 'meta_description':
 				$db_field = 'MetaDescription';
 				$cat_field = 'Description';
 				break;
 
 			case 'tracking':
 			case 'index_tools':
 				if (!EDITING_MODE) {
 					$tracking = $page->GetDBField('IndexTools');
 					return $tracking ? $tracking : $this->Application->ConfigValue('cms_DefaultTrackingCode');
 				}
 				// no break here on purpose
 
 			default:
 				return '';
 		}
 
 		$default = isset($params['default']) ? $params['default'] : '';
 		$val = $page->GetField($db_field);
 		if (!$default) {
 			if ( $this->Application->prefixRegistred('c') ) {
 				if (!$val && ($params['type'] == 'meta_keywords' || $params['type'] == 'meta_description')) {
 					// take category meta if it's not set for the page
 					return $this->Application->ProcessParsedTag('c', 'Meta', Array('name' => $cat_field));
 				}
 			}
 		}
 
 		if (isset($params['force_default']) && $params['force_default']) {
 			return $default;
 		}
 
 		if (preg_match('/^_Auto:/', $val)) {
 			$val = $default;
 
 			/*if ($db_field == 'Title') {
 				$page->SetDBField($db_field, $default);
 				$page->Update();
 			}*/
 		}
 		elseif ($page->GetID() == false) {
 			return $default;
 		}
 
 		return $val;
 	}
 
 	/**
 	 * Includes admin css and js, that are required for cms usage on Front-Edn
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function EditingScripts($params)
 	{
 		if ( $this->Application->GetVar('admin_scripts_included') || !EDITING_MODE ) {
 			return '';
 		}
 
 		$this->Application->SetVar('admin_scripts_included', 1);
 		$js_url = $this->Application->BaseURL() . 'core/admin_templates/js';
 
+		/** @var MinifyHelper $minify_helper */
 		$minify_helper = $this->Application->recallObject('MinifyHelper');
-		/* @var $minify_helper MinifyHelper */
 
 		$to_compress = Array (
 			$js_url . '/jquery/thickbox/thickbox.css',
 			$js_url . '/../incs/cms.css',
 			$js_url . '/../img/toolbar/toolbar-sprite.css',
 		);
 
 		$css_compressed = $minify_helper->CompressScriptTag(Array ('files' => implode('|', $to_compress), 'templates_base' => $js_url . '/../'));
 
 		$ret = '<link rel="stylesheet" href="' . $css_compressed . '" type="text/css" media="screen"/>' . "\n";
 
 		$ret .= '	<!--[if IE]>
 					<link rel="stylesheet" href="' . $js_url . '/../incs/cms_ie.css' . '" type="text/css" media="screen"/>
 					<![endif]-->';
 
 		if ( EDITING_MODE == EDITING_MODE_DESIGN ) {
 			$ret .= '	<style type="text/css" media="all">
 							div.movable-element .movable-header { cursor: move; }
 						</style>';
 		}
 
 		$ret .= '<script type="text/javascript" src="' . $js_url . '/jquery/jquery-1.9.1.min.js"></script>' . "\n";
 		$ret .= '<script type="text/javascript" src="' . $js_url . '/jquery/jquery-ui-1.10.3.custom.min.js"></script>' . "\n";
 
 		$to_compress = Array (
 			$js_url . '/is.js',
 			$js_url . '/application.js',
 			$js_url . '/script.js',
 			$js_url . '/toolbar.js',
 			$js_url . '/jquery/thickbox/thickbox.js',
 			$js_url . '/template_manager.js',
 		);
 
 		$js_compressed = $minify_helper->CompressScriptTag( Array ('files' => implode('|', $to_compress)) );
 
 		$ret .= '<script type="text/javascript" src="' . $js_compressed . '"></script>' . "\n";
 		$ret .= '<script language="javascript">' . "\n";
 		$ret .= "TB.pathToImage = '" . $js_url . "/jquery/thickbox/loadingAnimation.gif';" . "\n";
 
 		$template = $this->Application->GetVar('t');
 		$theme_id = $this->Application->GetVar('m_theme');
 
 		$url_params = Array ('block' => '#BLOCK#', 'theme-file_event' => '#EVENT#', 'theme_id' => $theme_id, 'source' => $template, 'pass' => 'all,theme-file', 'front' => 1, 'm_opener' => 'd', '__NO_REWRITE__' => 1);
 		$edit_template_url = $this->Application->HREF('themes/template_edit', ADMIN_DIRECTORY, $url_params, 'index.php');
 
 		$url_params = Array ('theme-file_event' => 'OnSaveLayout', 'source' => $template, 'pass' => 'all,theme-file', '__NO_REWRITE__' => 1);
 		$save_layout_url = $this->Application->HREF('index', '', $url_params);
 
 		$url_params = Array ('content_event' => 'OnSaveContentBlock', 'pass' => 'all,content', '__NO_REWRITE__' => 1);
 		$save_content_url = $this->Application->HREF('index', ADMIN_DIRECTORY, $url_params, 'index.php');
 
 		$page =& $this->_getPage($params);
 
+		/** @var PageHelper $page_helper */
 		$page_helper = $this->Application->recallObject('PageHelper');
-		/* @var $page_helper PageHelper */
 
 		$class_params = Array (
 			'languagePrefix' => 'l' . $this->Application->GetVar('m_lang') . '_',
 			'pageId' => $page->GetID(),
 			'pageInfo' => $page->isLoaded() ? $page_helper->getPageInfo( $page->GetID() ) : Array (),
 			'editUrl' => $edit_template_url,
 			'browseUrl' => $this->Application->HREF('', '', Array ('editing_mode' => '#EDITING_MODE#', '__NO_REWRITE__' => 1)),
 			'saveLayoutUrl' => $save_layout_url,
 			'saveContentUrl' => $save_content_url,
 			'editingMode' => (int)EDITING_MODE,
 		);
 
 		$site_name = strip_tags($this->Application->ConfigValue('Site_Name'));
 		$ret .= "var aTemplateManager = new TemplateManager(" . json_encode($class_params) . ");\n";
 		$ret .= "var main_title = '" . kUtil::escape($site_name, kUtil::ESCAPE_JS) . "';" . "\n";
 
 		$use_popups = (int)$this->Application->ConfigValue('UsePopups');
 		$ret .= "var \$use_popups = " . ($use_popups > 0 ? 'true' : 'false') . ";\n";
 		$ret .= "var \$modal_windows = " . ($use_popups == 2 ? 'true' : 'false') . ";\n";
 
 		if ( EDITING_MODE != EDITING_MODE_BROWSE ) {
 			$ret .= 'var $visible_toolbar_buttons = true' . ";\n";
 			$ret .= 'var $use_toolbarlabels = ' . ($this->Application->ConfigValue('UseToolbarLabels') ? 'true' : 'false') . ";\n";;
 
 			$ret .= "var base_url = '" . $this->Application->BaseURL() . "';" . "\n";
 			$ret .= 'TB.closeHtml = \'<img src="' . $js_url . '/../img/close_window15.gif" width="15" height="15" style="border-width: 0px;" alt="close"/><br/>\';' . "\n";
 
 			$url_params = Array ('m_theme' => '', 'pass' => 'm', 'm_opener' => 'r', '__NO_REWRITE__' => 1);
 			$browse_url = $this->Application->HREF('catalog/catalog', ADMIN_DIRECTORY, $url_params, 'index.php');
 			$browse_url = preg_replace('/&(admin|editing_mode)=[\d]/', '', $browse_url);
 
 			$admin_title = strip_tags($this->Application->Phrase('la_AdministrativeConsole', false));
 
 			$ret .= '
 				set_window_title(document.title + \' - ' . kUtil::escape($admin_title, kUtil::ESCAPE_JS) . '\');
 
 				t = \'' . $this->Application->GetVar('t') . '\';
 
 				if (window.parent.frames["menu"] != undefined) {
 					if ( $.isFunction(window.parent.frames["menu"].SyncActive) ) {
 						window.parent.frames["menu"].SyncActive("' . $browse_url . '");
 					}
 				}
 			';
 		}
 
 		$ret .= '</script>' . "\n";
 
 		if ( EDITING_MODE != EDITING_MODE_BROWSE ) {
 			// add form, so admin scripts could work
 			$ret .= '<form id="kernel_form" name="kernel_form" enctype="multipart/form-data" method="post" action="' . $browse_url . '">
 						<input type="hidden" name="MAX_FILE_SIZE" id="MAX_FILE_SIZE" value="' . MAX_UPLOAD_SIZE . '" />
 						<input type="hidden" name="sid" id="sid" value="' . $this->Application->GetSID() . '" />
 					</form>';
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Prints "Edit Page" button on cms page
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function EditPage($params)
 	{
 		if ( $this->Application->GetVar('preview') ) {
 			// prevents draft preview function to replace last template in session and break page/content block editing process
 			$this->Application->SetVar('skip_last_template', 1);
 		}
 
 		if (!EDITING_MODE) {
 			return '';
 		}
 
 		$display_mode = array_key_exists('mode', $params) ? $params['mode'] : false;
 		unset($params['mode']);
 		$edit_code = '';
 
 		$page =& $this->_getPage($params);
 
 		if (!$page->isLoaded() || (($display_mode != 'end') && (EDITING_MODE == EDITING_MODE_BROWSE))) {
 			// when "EditingScripts" tag is not used, make sure, that scripts are also included
 			return $this->EditingScripts($params);
 		}
 
 		// show "EditPage" button only for pages, that exists in structure
 		if ($display_mode != 'end') {
 			$edit_btn = $edit_url = '';
 
 			if ( EDITING_MODE == EDITING_MODE_CONTENT ) {
 				$item_prefix = isset($params['item_prefix']) ? $params['item_prefix'] : '';
 				unset($params['item_prefix']);
 
 				if ( $item_prefix ) {
 					$params['button_class'] = 'cms-section-properties-btn';
 					$edit_btn = $this->Application->ProcessParsedTag($item_prefix, 'AdminEditButton', $params) . "\n";
 				}
 				else {
 					$edit_btn = $this->AdminEditButton($params) . "\n"; // "st" object must be loaded before this
 				}
 			}
 			elseif ( EDITING_MODE == EDITING_MODE_DESIGN ) {
 				$url_params = Array(
 					'pass'			=>	'm,theme,theme-file',
 					'm_opener'		=>	'd',
 					'theme_id'		=>	$this->Application->GetVar('m_theme'),
 					'theme_mode'	=>	't',
 					'theme_event'	=>	'OnEdit',
 					'theme-file_id' =>	$this->_getThemeFileId(),
 					'front'			=>	1,
 					'__NO_REWRITE__'=>	1,
 					'index_file' => 'index.php',
 				);
 
 				$edit_url = $this->Application->HREF('themes/file_edit', ADMIN_DIRECTORY, $url_params);
 
 				$button1_icon = $this->Application->BaseURL() . 'core/admin_templates/img/top_frame/icons/save_button.gif';
 				$button1_title = $this->Application->Phrase('la_btn_SaveChanges', false, true);
 				$button1_code = '<button style="background-image: url(' . $button1_icon . '); onclick="aTemplateManager.saveLayout(); return false;" class="cms-btn-new cms-save-layout-btn">' . $button1_title . '</button>';
 
 				$button2_icon = $this->Application->BaseURL() . 'core/admin_templates/img/top_frame/icons/cancel_button.gif';
 				$button2_title = $this->Application->Phrase('la_btn_Cancel', false, true);
 				$button2_code = '<button style="background-image: url(' . $button2_icon . '); onclick="aTemplateManager.cancelLayout(); return false;" class="cms-btn-new cms-cancel-layout-btn">' . $button2_title . '</button>';
 
 				$button3_icon = $this->Application->BaseURL() . 'core/admin_templates/img/top_frame/icons/section_properties.png';
 				$button3_title = $this->Application->Phrase('la_btn_SectionTemplate', false, true);
 				$button3_code = '<button style="background-image: url(' . $button3_icon . ');' . ($display_mode === false ? ' margin: 0px;' : '') . '" onclick="$form_name=\'kf_'.$page->GetID().'\'; std_edit_item(\'theme\', \'themes/file_edit\');" class="cms-btn-new cms-section-properties-btn">' . $button3_title . '</button>';
 
 				$edit_btn .= '<div class="cms-layout-btn-container"' . ($display_mode === false ? ' style="margin: 0px;"' : '') . '>' . $button1_code . $button2_code . '</div>' . $button3_code . "\n";
 			}
 
 			if ( $display_mode == 'start' ) {
 				// button with border around the page
 				if ( EDITING_MODE == EDITING_MODE_CONTENT ) {
 					$tabs = "\n" . str_repeat("\t", 9);
 					$base_url = $this->Application->BaseURL();
 					$toolbar_hidden = $this->Application->GetVar('toolbar_hidden');
 
 					$edit_code .= '
 						<div>
 							<div id="cms-editing-notice">
 								<div class="top">
 									<a href="#" id="cms-close-editing-notice"></a>
 									<span prev_editors=""></span>
 								</div>
 								<div class="bottom"></div>
 							</div>
 
 							<div id="cms-revision-dropdown">
 								<div class="top"></div>
 								<div class="bottom"></div>
 							</div>
 						</div>';
 
 					if ( $this->Application->ConfigValue('EnablePageContentRevisionControl') ) {
 						$edit_code .= '<div id="cms-revision-toolbar-layer"' . ($toolbar_hidden ? ' style="top: -56px;"' : '') . '>
 											<div id="cms-revision-toolbar">
 												<script type="text/javascript">
 													var a_toolbar = new ToolBar(undefined, undefined, "' . $base_url . '#MODULE#/admin_templates/img/");
 													' . $this->toolbarButton('select', 'la_ToolTip_Save', $tabs) . $this->toolbarButton('delete', 'la_ToolTip_Discard', $tabs) . $tabs . 'a_toolbar.AddButton( new ToolBarSeparator("sep1") );';
 
 						if ( $this->Application->CheckAdminPermission('CATEGORY.REVISION.MODERATE', 0) ) {
 							$edit_code .= $this->toolbarButton('approve', 'la_ToolTip_Publish', $tabs) . $this->toolbarButton('decline', 'la_ToolTip_Decline', $tabs) . $tabs . 'a_toolbar.AddButton( new ToolBarSeparator("sep2") );';
 						}
 
 						$edit_code .= $this->toolbarButton('preview', 'la_ToolTip_Preview', $tabs);
 
 						if ( $this->Application->CheckAdminPermission('CATEGORY.REVISION.HISTORY.VIEW', 0) ) {
 							$edit_code .= $this->toolbarButton('history', 'la_ToolTip_History', $tabs);
 						}
 
 						$edit_code .= $tabs . 'a_toolbar.Render();' . "\n";
 
+						/** @var kDBItem $revision */
 						$revision = $this->Application->recallObject('page-revision.current');
-						/* @var $revision kDBItem */
 
+						/** @var PageHelper $page_helper */
 						$page_helper = $this->Application->recallObject('PageHelper');
-						/* @var $page_helper PageHelper */
 
 						foreach ( $page_helper->getToolbarButtonsState($revision) as $toolbar_button => $is_enabled ) {
 							$edit_code .= $tabs . 'a_toolbar.SetEnabled("' . $toolbar_button . '", ' . json_encode($is_enabled) . ');';
 						}
 
 						$publishing_tools = $this->Application->Phrase('la_btn_PublishingTools', false, true);
 
 						$edit_code .= substr($tabs, 0, -1) . '</script>
 
 									<div id="cms-current-revision-info">
 										<span class="revision-title"></span>
 										<div class="draft-saved"></div>
 									</div>
 
 									<a href="#" id="cms-close-toolbar"></a>
 									<div class="cms-clear"></div>
 								</div>
 
 								<a href="#" id="cms-toggle-revision-toolbar"' . ($toolbar_hidden ? '' : ' class="opened"') . '><span>' . $publishing_tools . '</span></a>
 							</div>' . "\n";
 					}
 				}
 
 				$edit_code .= '<div class="cms-section-properties-btn-container">' . $edit_btn . '<div class="cms-btn-content">';
 
 			}
 			else {
 				// button without border around the page
 				$edit_code .= $edit_btn;
 			}
 		}
 
 		if ($display_mode == 'end') {
 			// draw border around the page
 			$edit_code .= '</div></div>';
 		}
 
 		if ($display_mode != 'end') {
 			if ( EDITING_MODE == EDITING_MODE_CONTENT ) {
 				$url_params = Array(
 					'pass'			=>	'm',
 					'm_opener'		=>	'd',
 					'm_cat_id'		=>	$page->GetID(),
 					'__NO_REWRITE__'=>	1,
 					'front'			=>	1,
 					'index_file' => 'index.php',
 				);
 
 				$revision = $this->Application->GetVar('revision');
 
 				if ( $revision ) {
 					$url_params['revision'] = $revision;
 				}
 
 				$page_admin_url = $this->Application->HREF('', ADMIN_DIRECTORY, $url_params);
 				$edit_code .= '<form method="POST" style="display: inline; margin: 0px" name="kf_revisions_'.$page->GetID().'" id="kf_revisions_'.$page->GetID().'" action="' . $page_admin_url . '">
 					<input type="hidden" name="revision" value="' . $this->Application->GetVar('revision', 0) . '"/>
 				</form>';
 			}
 
 			if ( $edit_url ) {
 				$edit_code .= '<form method="POST" style="display: inline; margin: 0px" name="kf_' . $page->GetID() . '" id="kf_' . $page->GetID() . '" action="' . $edit_url . '"></form>';
 			}
 
 			// when "EditingScripts" tag is not used, make sure, that scripts are also included
 			$edit_code .= $this->EditingScripts($params);
 		}
 
 		return $edit_code;
 	}
 
 	function toolbarButton($name, $title, $tabs)
 	{
 		$action = 'function() { aTemplateManager.revisionToolbarClick("' . $name . '"); }';
 		$phrase = kUtil::escape($this->Application->Phrase($title, false, true), kUtil::ESCAPE_HTML . '+' . kUtil::ESCAPE_JS);
 
 		return $tabs . 'a_toolbar.AddButton(new ToolBarButton("' . $name . '", "' . $phrase . '", ' . $action . '));';
 	}
 
 	function _getThemeFileId()
 	{
 		$template = $this->Application->GetVar('t');
 
 		if (!$this->Application->TemplatesCache->TemplateExists($template) && !$this->Application->isAdmin) {
+			/** @var CategoriesEventHandler $cms_handler */
 			$cms_handler = $this->Application->recallObject($this->Prefix . '_EventHandler');
-			/* @var $cms_handler CategoriesEventHandler */
 
 			$template = ltrim($cms_handler->GetDesignTemplate(), '/');
 		}
 
 		$file_path = dirname($template) == '.' ? '' : '/' . dirname($template);
 		$file_name = basename($template);
 
 		$sql = 'SELECT FileId
 				FROM ' . TABLE_PREFIX . 'ThemeFiles
 				WHERE (ThemeId = ' . (int)$this->Application->GetVar('m_theme') . ') AND (FilePath = ' . $this->Conn->qstr($file_path) . ') AND (FileName = ' . $this->Conn->qstr($file_name . '.tpl') . ')';
 		return $this->Conn->GetOne($sql);
 	}
 
 	/**
 	 * Creates a button for editing item in Admin Console
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function AdminEditButton($params)
 	{
 		if ( EDITING_MODE != EDITING_MODE_CONTENT ) {
 			return '';
 		}
 
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		$params['item_prefix'] = 'c';
 
 		if ( $this->Prefix == 'st' ) {
 			$params['button_icon'] = 'section_properties.png';
 			$params['button_class'] = 'cms-section-properties-btn';
 			$params['button_title'] = 'la_btn_SectionProperties';
 		}
 
 		return parent::AdminEditButton($params);
 	}
 
 	/**
 	 * Builds site menu
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function CachedMenu($params)
 	{
+		/** @var MenuHelper $menu_helper */
 		$menu_helper = $this->Application->recallObject('MenuHelper');
-		/* @var $menu_helper MenuHelper */
 
 		return $menu_helper->menuTag($this->getPrefixSpecial(), $params);
 	}
 
 	/**
 	 * Trick to allow some kind of output formatting when using CachedMenu tag
 	 *
 	 * @param Array $params
 	 * @return bool
 	 */
 	function SplitColumn($params)
 	{
 		return $this->Application->GetVar($params['i']) > ceil($params['total'] / $params['columns']);
 	}
 
 	/**
 	 * Returns direct children count of given category
 	 *
 	 * @param Array $params
 	 * @return int
 	 */
 	function HasSubCats($params)
 	{
 		$sql = 'SELECT COUNT(*)
 				FROM ' . TABLE_PREFIX . 'Categories
 				WHERE ParentId = ' . $params['cat_id'];
 
 		return $this->Conn->GetOne($sql);
 	}
 
 	/**
 	 * Prints sub-pages of given/current page.
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @todo This could be reached by using "parent_cat_id" parameter. Only difference here is new block parameter "path". Need to rewrite.
 	 */
 	function PrintSubPages($params)
 	{
+		/** @var kDBList $list */
 		$list = $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix.'_List', $params);
-		/* @var $list kDBList */
 
 		$category_id = array_key_exists('category_id', $params) ? $params['category_id'] : $this->Application->GetVar('m_cat_id');
 
 		$list->addFilter('current_pages', TABLE_PREFIX . 'CategoryItems.CategoryId = ' . $category_id);
 		$list->Query();
 		$list->GoFirst();
 
 		$o = '';
 		$block_params = $this->prepareTagParams($params);
 		$block_params['name'] = $params['render_as'];
 
 		while (!$list->EOL()) {
 			$block_params['path'] = $list->GetDBField('Path');
 			$o .= $this->Application->ParseBlock($block_params);
 
 			$list->GoNext();
 		}
 
 		return $o;
 	}
 
 	/**
 	 * Builds link for browsing current page on Front-End
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function PageBrowseLink($params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
+		/** @var kThemesHelper $themes_helper */
 		$themes_helper = $this->Application->recallObject('ThemesHelper');
-		/* @var $themes_helper kThemesHelper */
 
+		/** @var SiteConfigHelper $site_config_helper */
 		$site_config_helper = $this->Application->recallObject('SiteConfigHelper');
-		/* @var $site_config_helper SiteConfigHelper */
 
 		$settings = $site_config_helper->getSettings();
 
 		$url_params = Array (
 			'm_cat_id' => $object->GetID(),
 			'm_theme' => $themes_helper->getCurrentThemeId(),
 			'editing_mode' => $settings['default_editing_mode'],
 			'pass' => 'm',
 			'admin' => 1,
 		);
 
 		if ($this->Application->ConfigValue('UseModRewrite')) {
 			$url_params['__MOD_REWRITE__'] = 1;
 		}
 		else {
 			$url_params['index_file'] = 'index.php';
 		}
 
 		return $this->Application->HREF($object->GetDBField('NamedParentPath'), '_FRONT_END_', $url_params);
 	}
 
 	/**
 	 * Builds a link for securely accessing a page later (even if it will not be publicly accessible)
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function DirectLink($params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
+		/** @var kThemesHelper $themes_helper */
 		$themes_helper = $this->Application->recallObject('ThemesHelper');
-		/* @var $themes_helper kThemesHelper */
 
 		$url_params = Array (
 			'm_cat_id' => $object->GetID(),
 			'm_theme' => $themes_helper->getCurrentThemeId(),
 			'pass' => 'm',
 			'authkey' => $object->GetDBField('DirectLinkAuthKey'),
 			'__SSL__' => 0,
 			'__NO_SID__' => 0,
 		);
 
 		if ($this->Application->ConfigValue('UseModRewrite')) {
 			$url_params['__MOD_REWRITE__'] = 1;
 		}
 		else {
 			$url_params['index_file'] = 'index.php';
 		}
 
 		return $this->Application->HREF($object->GetDBField('NamedParentPath'), '_FRONT_END_', $url_params);
 	}
 
 	/**
 	 * Builds link to category as a cms page
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function ContentPageLink($params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		$params['t'] = mb_strtolower($object->GetDBField('NamedParentPath'));
 		$params['m_cat_id'] = 0;
 
 		return $this->Application->ProcessParsedTag('m', 'Link', $params);
 	}
 
 	/**
 	 * Prepares cms page description for search result page
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function SearchDescription($params)
 	{
 		$object = $this->getObject($params);
 		$desc =  $object->GetField('MetaDescription');
 		if (!$desc) {
 			$sql = 'SELECT *
 					FROM ' . TABLE_PREFIX . 'PageContent
 					WHERE PageId = ' . $object->GetID() . ' AND ContentNum = 1';
 			$content = $this->Conn->GetRow($sql);
 
 			if ($content['l'.$this->Application->GetVar('m_lang').'_Content']) {
 				$desc = $content['l'.$this->Application->GetVar('m_lang').'_Content'];
 			}
 			else {
 				$desc = $content['l'.$this->Application->GetDefaultLanguageId().'_Content'];
 			}
 		}
 
 		return mb_substr($desc, 0, 300).(mb_strlen($desc) > 300 ? '...' : '');
 	}
 
 	/**
 	 * Simplified version of "c:CategoryLink" for "c:PrintList"
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @todo Used? Needs refactoring.
 	 */
 	function EnterCatLink($params)
 	{
 		$object = $this->getObject($params);
 
 		$url_params = Array ('pass' => 'm', 'm_cat_id' => $object->GetID());
 		return $this->Application->HREF($params['template'], '', $url_params);
 	}
 
 	/**
 	 * Simplified version of "c:CategoryPath", that do not use blocks for rendering
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @todo Used? Maybe needs to be removed.
 	 */
 	function PagePath($params)
 	{
 		$object = $this->getObject($params);
 		$path = $object->GetField('CachedNavbar');
 		if ($path) {
 			$items = explode('&|&', $path);
 			array_shift($items);
 			return implode(' -&gt; ', $items);
 		}
 
 		return '';
 	}
 
 	/**
 	 * Returns configuration variable value
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @todo Needs to be replaced with "m:GetConfig" tag; Not used now (were used on structure_edit.tpl).
 	 */
 	function AllowManualFilenames($params)
 	{
 		return $this->Application->ConfigValue('ProjCMSAllowManualFilenames');
 	}
 
 	/**
 	 * Draws path to current page (each page can be link to it)
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function CurrentPath($params)
 	{
 		$block_params = $this->prepareTagParams($params);
 		$block_params['name'] = $block_params['render_as'];
 
+		/** @var kDBItem $object */
 		$object = $this->Application->recallObject($this->Prefix);
-		/* @var $object kDBItem */
 
 		$category_ids = explode('|', substr($object->GetDBField('ParentPath'), 1, -1));
 
 		$config = $this->getUnitConfig();
 		$language = (int)$this->Application->GetVar('m_lang');
 
 		if ( !$language ) {
 			$language = 1;
 		}
 
 		$sql = 'SELECT l' . $language . '_Name AS Name, NamedParentPath
 				FROM ' . $config->getTableName() . '
 				WHERE ' . $config->getIDField() . ' IN (' . implode(',', $category_ids) . ')';
 		$categories_data = $this->Conn->Query($sql);
 
 		$ret = '';
 		foreach ($categories_data as $index => $category_data) {
 			if ( $category_data['Name'] == 'Content' ) {
 				continue;
 			}
 
 			$block_params['title'] = $category_data['Name'];
 			$block_params['template'] = preg_replace('/^Content\//i', '', $category_data['NamedParentPath']);
 			$block_params['is_first'] = $index == 1; // because Content is 1st element
 			$block_params['is_last'] = $index == count($categories_data) - 1;
 
 			$ret .= $this->Application->ParseBlock($block_params);
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Synonim to PrintList2 for "onlinestore" theme
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function ListPages($params)
 	{
 		return $this->PrintList2($params);
 	}
 
 	/**
 	 * Returns information about parser element locations in template
 	 *
 	 * @param Array $params
 	 * @return mixed
 	 */
 	function BlockInfo($params)
 	{
 		if (!EDITING_MODE) {
 			return '';
 		}
 
+		/** @var TemplateHelper $template_helper */
 		$template_helper = $this->Application->recallObject('TemplateHelper');
-		/* @var $template_helper TemplateHelper */
 
 		return $template_helper->blockInfo( $params['name'] );
 	}
 
 	/**
 	 * Hide all editing tabs except permission tab, when editing "Home" (ID = 0) category
 	 *
 	 * @param Array $params
 	 */
 	function ModifyUnitConfig($params)
 	{
 		$root_category = $this->Application->RecallVar('IsRootCategory_' . $this->Application->GetVar('m_wid'));
 
 		if ( !$root_category ) {
 			return;
 		}
 
 		$config = $this->getUnitConfig();
 		$edit_tab_preset = $config->getEditTabPresetByName('Default');
 
 		$config->addEditTabPresets(Array (
 			'Default' => Array ('permissions' => $edit_tab_preset['permissions'])
 		));
 	}
 
 	/**
 	 * Prints catalog export templates
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function PrintCatalogExportTemplates($params)
 	{
 		$ret = Array ();
 		$prefixes = explode(',', $params['prefixes']);
 
 		foreach ($prefixes as $prefix) {
 			if ( $this->Application->prefixRegistred($prefix) ) {
 				$module_path = $this->Application->getUnitConfig($prefix)->getModuleFolder() . '/';
 				$module_name = $this->Application->findModule('Path', $module_path, 'Name');
 
 				$ret[$prefix] = mb_strtolower($module_name) . '/export';
 			}
 		}
 
 		return json_encode($ret);
 	}
 
 	/**
 	 * Checks, that "view in browse mode" functionality available
 	 *
 	 * @param Array $params
 	 * @return bool
 	 */
 	function BrowseModeAvailable($params)
 	{
 		$valid_special = $params['Special'] != 'user';
 		$not_selector = $this->Application->GetVar('type') != 'item_selector';
 
 		return $valid_special && $not_selector;
 	}
 
 	/**
 	 * Returns a link for editing product
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function ItemEditLink($params)
 	{
+		/** @var kDBList $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBList */
 
 		$config = $this->getUnitConfig();
 		$edit_template = $config->getAdminTemplatePath() . '/' . $config->getAdminTemplatePrefix() . 'edit';
 
 		$url_params = Array (
 			'm_opener'				=>	'd',
 			$this->Prefix.'_mode'	=>	't',
 			$this->Prefix.'_event'	=>	'OnEdit',
 			$this->Prefix.'_id'		=>	$object->GetID(),
 			'm_cat_id'				=>	$object->GetDBField('ParentId'),
 			'pass'					=>	'all,'.$this->Prefix,
 			'no_pass_through'		=>	1,
 		);
 
 		return $this->Application->HREF($edit_template,'', $url_params);
 	}
 
 	function RelevanceIndicator($params)
 	{
 		/** @var kDBItem $object */
 		$object = $this->getObject($params);
 
 		/** @var kSearchHelper $search_helper */
 		$search_helper = $this->Application->recallObject('SearchHelper');
 
 		$search_results_table = $search_helper->getSearchTable();
 		$sql = 'SELECT Relevance
 				FROM ' . $search_results_table . '
 				WHERE ResourceId = ' . $object->GetDBField('ResourceId');
 
     	$percents_off = (int)(100 - (100 * $this->Conn->GetOne($sql)));
     	$percents_off = ($percents_off < 0) ? 0 : $percents_off;
     	if ($percents_off) {
         	$params['percent_off'] = $percents_off;
     		$params['percent_on'] = 100 - $percents_off;
         	$params['name'] = $this->SelectParam($params, 'relevance_normal_render_as,block_relevance_normal');
     	}
     	else {
     		$params['name'] = $this->SelectParam($params, 'relevance_full_render_as,block_relevance_full');
     	}
     	return $this->Application->ParseBlock($params);
 	}
 
 	/**
 	 * Returns list of categories, that have category add/edit permission
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function AllowedCategoriesJSON($params)
 	{
 		if ($this->Application->RecallVar('user_id') == USER_ROOT) {
 			$categories = true;
 		}
 		else {
+			/** @var kDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBItem */
 
+			/** @var kPermissionsHelper $perm_helper */
 			$perm_helper = $this->Application->recallObject('PermissionsHelper');
-			/* @var $perm_helper kPermissionsHelper */
 
 			$perm_prefix = $this->getUnitConfig()->getPermItemPrefix();
 			$categories = $perm_helper->getPermissionCategories($perm_prefix . '.' . ($object->IsNewItem() ? 'ADD' : 'MODIFY'));
 		}
 
+		/** @var JSONHelper $json_helper */
 		$json_helper = $this->Application->recallObject('JSONHelper');
-		/* @var $json_helper JSONHelper */
 
 		return $json_helper->encode($categories);
 	}
 
 	function PageEditable($params)
 	{
 		if ($this->Application->isDebugMode()) {
 			return true;
 		}
 
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		return !$object->GetDBField('Protected');
 	}
 
 	/**
 	 * Returns element for "__item__" navigation bar part
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function CategoryItemElement($params)
 	{
+		/** @var CategoryHelper $category_helper */
 		$category_helper = $this->Application->recallObject('CategoryHelper');
-		/* @var $category_helper CategoryHelper */
 
+		/** @var kNavigationBar $navigation_bar */
 		$navigation_bar = $this->Application->recallObject('kNavigationBar');
-		/* @var $navigation_bar kNavigationBar */
 
 		$category_id = isset($params['cat_id']) ? $params['cat_id'] : $this->Application->GetVar('m_cat_id');
 		$parent_path = explode('|', substr($navigation_bar->getParentPath($category_id), 1, -1));
 		array_shift($parent_path); // remove "Content" category
 		$module_info = $category_helper->getCategoryModule($params, $parent_path);
 
 		if ( !$module_info ) {
 			return '';
 		}
 
 		$module_prefix = $module_info['Var'];
 
+		/** @var kCatDBItem $object */
 		$object = $this->Application->recallObject($module_prefix);
-		/* @var $object kCatDBItem */
 
 		$title_field = $this->Application->getUnitConfig($module_prefix)->getTitleField();
 		$block_params = $this->prepareTagParams($params);
 		$block_params['name'] = $params['render_as'];
 
 		$block_params['title'] = $object->GetField($title_field);
 		$block_params['prefix'] = $module_prefix;
 
 		return $this->Application->ParseBlock($block_params);
 	}
 }
Index: branches/5.3.x/core/units/categories/categories_event_handler.php
===================================================================
--- branches/5.3.x/core/units/categories/categories_event_handler.php	(revision 16518)
+++ branches/5.3.x/core/units/categories/categories_event_handler.php	(revision 16519)
@@ -1,2905 +1,2905 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class CategoriesEventHandler extends kDBEventHandler {
 
 		/**
 		 * Allows to override standard permission mapping
 		 *
 		 * @return void
 		 * @access protected
 		 * @see kEventHandler::$permMapping
 		 */
 		protected function mapPermissions()
 		{
 			parent::mapPermissions();
 
 			$permissions = Array (
 				'OnRebuildCache' => Array ('self' => 'add|edit'),
 				'OnCopy' => Array ('self' => true),
 				'OnCut' => Array ('self' => 'edit'),
 				'OnPasteClipboard' => Array ('self' => true),
 				'OnPaste' => Array ('self' => 'add|edit', 'subitem' => 'edit'),
 
 				'OnRecalculatePriorities' => Array ('self' => 'add|edit'), // category ordering
 				'OnItemBuild' => Array ('self' => true), // always allow to view individual categories (regardless of CATEGORY.VIEW right)
 				'OnUpdatePreviewBlock' => Array ('self' => true), // for FCKEditor integration
 			);
 
 			$this->permMapping = array_merge($this->permMapping, $permissions);
 		}
 
 		/**
 		 * Categories are sorted using special sorting event
 		 *
 		 */
 		function mapEvents()
 		{
 			parent::mapEvents();
 
 			$events_map = Array (
 				'OnMassMoveUp' => 'OnChangePriority',
 				'OnMassMoveDown' => 'OnChangePriority',
 			);
 
 			$this->eventMethods = array_merge($this->eventMethods, $events_map);
 		}
 
 		/**
 		 * Checks user permission to execute given $event
 		 *
 		 * @param kEvent $event
 		 * @return bool
 		 * @access public
 		 */
 		public function CheckPermission(kEvent $event)
 		{
 			if ( $event->Name == 'OnResetCMSMenuCache' ) {
 				// events from "Tools -> System Tools" section are controlled via that section "edit" permission
 
+				/** @var kPermissionsHelper $perm_helper */
 				$perm_helper = $this->Application->recallObject('PermissionsHelper');
-				/* @var $perm_helper kPermissionsHelper */
 
 				$perm_value = $this->Application->CheckPermission('in-portal:service.edit');
 
 				return $perm_helper->finalizePermissionCheck($event, $perm_value);
 			}
 
 			if ( !$this->Application->isAdmin ) {
 				if ( $event->Name == 'OnSetSortingDirect' ) {
 					// allow sorting on front event without view permission
 					return true;
 				}
 
 				if ( $event->Name == 'OnItemBuild' ) {
 					$category_id = $this->getPassedID($event);
 					if ( $category_id == 0 ) {
 						return true;
 					}
 				}
 			}
 
 			if ( in_array($event->Name, $this->_getMassPermissionEvents()) ) {
 				$items = $this->_getPermissionCheckInfo($event);
 
+				/** @var kPermissionsHelper $perm_helper */
 				$perm_helper = $this->Application->recallObject('PermissionsHelper');
-				/* @var $perm_helper kPermissionsHelper */
 
 				if ( ($event->Name == 'OnSave') && array_key_exists(0, $items) ) {
 					// adding new item (ID = 0)
 					$perm_value = $perm_helper->AddCheckPermission($items[0]['ParentId'], $event->Prefix) > 0;
 				}
 				else {
 					// leave only items, that can be edited
 					$ids = Array ();
 					$check_method = in_array($event->Name, Array ('OnMassDelete', 'OnCut')) ? 'DeleteCheckPermission' : 'ModifyCheckPermission';
 					foreach ($items as $item_id => $item_data) {
 						if ( $perm_helper->$check_method($item_data['CreatedById'], $item_data['ParentId'], $event->Prefix) > 0 ) {
 							$ids[] = $item_id;
 						}
 					}
 
 					if ( !$ids ) {
 						// no items left for editing -> no permission
 						return $perm_helper->finalizePermissionCheck($event, false);
 					}
 
 					$perm_value = true;
 					$event->setEventParam('ids', $ids); // will be used later by "kDBEventHandler::StoreSelectedIDs" method
 				}
 
 				return $perm_helper->finalizePermissionCheck($event, $perm_value);
 			}
 
 			if ( $event->Name == 'OnRecalculatePriorities' ) {
+				/** @var kPermissionsHelper $perm_helper */
 				$perm_helper = $this->Application->recallObject('PermissionsHelper');
-				/* @var $perm_helper kPermissionsHelper */
 
 				$category_id = $this->Application->GetVar('m_cat_id');
 
 				return $perm_helper->AddCheckPermission($category_id, $event->Prefix) || $perm_helper->ModifyCheckPermission(0, $category_id, $event->Prefix);
 			}
 
 			if ( $event->Name == 'OnPasteClipboard' ) {
 				// forces permission check to work by current category for "Paste In Category" operation
 				$category_id = $this->Application->GetVar('m_cat_id');
 				$this->Application->SetVar('c_id', $category_id);
 			}
 
 			return parent::CheckPermission($event);
 		}
 
 		/**
 		 * Returns events, that require item-based (not just event-name based) permission check
 		 *
 		 * @return Array
 		 */
 		function _getMassPermissionEvents()
 		{
 			return Array (
 				'OnEdit', 'OnSave', 'OnMassDelete', 'OnMassApprove',
 				'OnMassDecline', 'OnMassMoveUp', 'OnMassMoveDown',
 				'OnCut',
 			);
 		}
 
 		/**
 		 * Returns category item IDs, that require permission checking
 		 *
 		 * @param kEvent $event
 		 * @return string
 		 */
 		function _getPermissionCheckIDs($event)
 		{
 			if ($event->Name == 'OnSave') {
 				$selected_ids = implode(',', $this->getSelectedIDs($event, true));
 				if (!$selected_ids) {
 					$selected_ids = 0; // when saving newly created item (OnPreCreate -> OnPreSave -> OnSave)
 				}
 			}
 			else {
 				// OnEdit, OnMassDelete events, when items are checked in grid
 				$selected_ids = implode(',', $this->StoreSelectedIDs($event));
 			}
 
 			return $selected_ids;
 		}
 
 		/**
 		 * Returns information used in permission checking
 		 *
 		 * @param kEvent $event
 		 * @return Array
 		 */
 		function _getPermissionCheckInfo($event)
 		{
 			// when saving data from temp table to live table check by data from temp table
 			$config = $event->getUnitConfig();
 			$id_field = $config->getIDField();
 			$table_name = $config->getTableName();
 
 			if ($event->Name == 'OnSave') {
 				$table_name = $this->Application->GetTempName($table_name, 'prefix:' . $event->Prefix);
 			}
 
 			$sql = 'SELECT ' . $id_field . ', CreatedById, ParentId
 					FROM ' . $table_name . '
 					WHERE ' . $id_field . ' IN (' . $this->_getPermissionCheckIDs($event) . ')';
 			$items = $this->Conn->Query($sql, $id_field);
 
 			if (!$items) {
 				// when creating new category, then no IDs are stored in session
 				$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
 				list ($id, $fields_hash) = each($items_info);
 
 				if (array_key_exists('ParentId', $fields_hash)) {
 					$item_category = $fields_hash['ParentId'];
 				}
 				else {
 					$item_category = $this->Application->RecallVar('m_cat_id'); // saved in c:OnPreCreate event permission checking
 				}
 
 				$items[$id] = Array (
 					'CreatedById' => $this->Application->RecallVar('user_id'),
 					'ParentId' => $item_category,
 				);
 			}
 
 			return $items;
 		}
 
 		/**
 		 * Set's mark, that root category is edited
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnEdit(kEvent $event)
 		{
 			$category_id = $this->Application->GetVar($event->getPrefixSpecial() . '_id');
 			$home_category = $this->Application->getBaseCategory();
 
 			$this->Application->StoreVar('IsRootCategory_' . $this->Application->GetVar('m_wid'), ($category_id === '0') || ($category_id == $home_category));
 
 			parent::OnEdit($event);
 
 			if ( $event->status == kEvent::erSUCCESS ) {
 				// keep "Section Properties" link (in browse modes) clean
 				$this->Application->DeleteVar('admin');
 			}
 		}
 
 		/**
 		 * Adds selected link to listing
 		 *
 		 * @param kEvent $event
 		 */
 		function OnProcessSelected($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$selected_ids = $this->Application->GetVar('selected_ids');
 
 			$this->RemoveRequiredFields($object);
 			$object->SetDBField($this->Application->RecallVar('dst_field'), $selected_ids['c']);
 			$object->Update();
 
 			$event->SetRedirectParam('opener', 'u');
 		}
 
 		/**
 		 * Apply system filter to categories list
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
 		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			// don't show "Content" category in advanced view
 			$object->addFilter('system_categories', '%1$s.Status <> 4');
 
 			// show system templates from current theme only + all virtual templates
 			$object->addFilter('theme_filter', '%1$s.ThemeId = ' . $this->_getCurrentThemeId() . ' OR %1$s.ThemeId = 0');
 
 			if ($event->Special == 'showall') {
 				// if using recycle bin don't show categories from there
 				$recycle_bin = $this->Application->ConfigValue('RecycleBinFolder');
 				if ($recycle_bin) {
 					$sql = 'SELECT TreeLeft, TreeRight
 							FROM '.TABLE_PREFIX.'Categories
 							WHERE CategoryId = '.$recycle_bin;
 					$tree_indexes = $this->Conn->GetRow($sql);
 
 					$object->addFilter('recyclebin_filter', '%1$s.TreeLeft < '.$tree_indexes['TreeLeft'].' OR %1$s.TreeLeft > '.$tree_indexes['TreeRight']);
 				}
 			}
 
 			if ( (string)$event->getEventParam('parent_cat_id') !== '' ) {
 				$parent_cat_id = $event->getEventParam('parent_cat_id');
 
 				if ("$parent_cat_id" == 'Root') {
 					$module_name = $event->getEventParam('module') ? $event->getEventParam('module') : 'In-Commerce';
 					$parent_cat_id = $this->Application->findModule('Name', $module_name, 'RootCat');
 				}
 			}
 			else {
 				$parent_cat_id = $this->Application->GetVar('c_id');
 				if (!$parent_cat_id) {
 					$parent_cat_id = $this->Application->GetVar('m_cat_id');
 				}
 				if (!$parent_cat_id) {
 					$parent_cat_id = 0;
 				}
 			}
 
 			if ("$parent_cat_id" == '0') {
 				// replace "0" category with "Content" category id (this way template
 				$parent_cat_id = $this->Application->getBaseCategory();
 			}
 
 			if ("$parent_cat_id" != 'any') {
 				if ($event->getEventParam('recursive')) {
 					if ($parent_cat_id > 0) {
 						// not "Home" category
 						$tree_indexes = $this->Application->getTreeIndex($parent_cat_id);
 
 						$object->addFilter('parent_filter', '%1$s.TreeLeft BETWEEN '.$tree_indexes['TreeLeft'].' AND '.$tree_indexes['TreeRight']);
 					}
 				}
 				else {
 					$object->addFilter('parent_filter', '%1$s.ParentId = '.$parent_cat_id);
 				}
 			}
 
 			$this->applyViewPermissionFilter($object);
 
 			if (!$this->Application->isAdminUser)	{
 				// apply status filter only on front
 				$object->addFilter('status_filter', $object->TableName.'.Status = 1');
 			}
 
 			// process "types" and "except" parameters
 			$type_clauses = Array();
 
 			$types = $event->getEventParam('types');
 			$types = $types ? explode(',', $types) : Array ();
 
 			$except_types = $event->getEventParam('except');
 			$except_types = $except_types ? explode(',', $except_types) : Array ();
 
 			$config = $event->getUnitConfig();
 
 			if (in_array('related', $types) || in_array('related', $except_types)) {
 				$related_to = $event->getEventParam('related_to');
 				if (!$related_to) {
 					$related_prefix = $event->Prefix;
 				}
 				else {
 					$sql = 'SELECT Prefix
 							FROM '.TABLE_PREFIX.'ItemTypes
 							WHERE ItemName = '.$this->Conn->qstr($related_to);
 					$related_prefix = $this->Conn->GetOne($sql);
 				}
 
 				$rel_table = $this->Application->getUnitConfig('rel')->getTableName();
 				$item_type = (int)$config->getItemType();
 
 				if ($item_type == 0) {
 					trigger_error('<strong>ItemType</strong> not defined for prefix <strong>' . $event->Prefix . '</strong>', E_USER_WARNING);
 				}
 
 				// process case, then this list is called inside another list
 				$prefix_special = $event->getEventParam('PrefixSpecial');
 				if (!$prefix_special) {
 					$prefix_special = $this->Application->Parser->GetParam('PrefixSpecial');
 				}
 
 				$id = false;
 				if ($prefix_special !== false) {
 					$processed_prefix = $this->Application->processPrefix($prefix_special);
 					if ($processed_prefix['prefix'] == $related_prefix) {
 						// printing related categories within list of items (not on details page)
+						/** @var kDBList $list */
 						$list = $this->Application->recallObject($prefix_special);
-						/* @var $list kDBList */
 
 						$id = $list->GetID();
 					}
 				}
 
 				if ($id === false) {
 					// printing related categories for single item (possibly on details page)
 					if ($related_prefix == 'c') {
 						$id = $this->Application->GetVar('m_cat_id');
 					}
 					else {
 						$id = $this->Application->GetVar($related_prefix . '_id');
 					}
 				}
 
+				/** @var kCatDBItem $p_item */
 				$p_item = $this->Application->recallObject($related_prefix . '.current', null, Array('skip_autoload' => true));
-				/* @var $p_item kCatDBItem */
 
 				$p_item->Load( (int)$id );
 
 				$p_resource_id = $p_item->GetDBField('ResourceId');
 
 				$sql = 'SELECT SourceId, TargetId FROM '.$rel_table.'
 						WHERE
 							(Enabled = 1)
 							AND (
 									(Type = 0 AND SourceId = '.$p_resource_id.' AND TargetType = '.$item_type.')
 									OR
 									(Type = 1
 										AND (
 												(SourceId = '.$p_resource_id.' AND TargetType = '.$item_type.')
 												OR
 												(TargetId = '.$p_resource_id.' AND SourceType = '.$item_type.')
 											)
 									)
 							)';
 
 				$related_ids_array = $this->Conn->Query($sql);
 				$related_ids = Array();
 
 				foreach ($related_ids_array as $key => $record) {
 					$related_ids[] = $record[ $record['SourceId'] == $p_resource_id ? 'TargetId' : 'SourceId' ];
 				}
 
 				if (count($related_ids) > 0) {
 					$type_clauses['related']['include'] = '%1$s.ResourceId IN ('.implode(',', $related_ids).')';
 					$type_clauses['related']['except'] = '%1$s.ResourceId NOT IN ('.implode(',', $related_ids).')';
 				}
 				else {
 					$type_clauses['related']['include'] = '0';
 					$type_clauses['related']['except'] = '1';
 				}
 
 				$type_clauses['related']['having_filter'] = false;
 			}
 
 			if (in_array('category_related', $type_clauses)) {
 				$object->removeFilter('parent_filter');
 				$resource_id = $this->Conn->GetOne('
 								SELECT ResourceId FROM '.$config->getTableName().'
 								WHERE CategoryId = '.$parent_cat_id
 							);
 
 				$sql = 'SELECT DISTINCT(TargetId) FROM '.TABLE_PREFIX.'CatalogRelationships
 						WHERE SourceId = '.$resource_id.' AND SourceType = 1';
 				$related_cats = $this->Conn->GetCol($sql);
 				$related_cats = is_array($related_cats) ? $related_cats : Array();
 
 				$sql = 'SELECT DISTINCT(SourceId) FROM '.TABLE_PREFIX.'CatalogRelationships
 						WHERE TargetId = '.$resource_id.' AND TargetType = 1 AND Type = 1';
 				$related_cats2 = $this->Conn->GetCol($sql);
 				$related_cats2 = is_array($related_cats2) ? $related_cats2 : Array();
 				$related_cats = array_unique( array_merge( $related_cats2, $related_cats ) );
 
 				if ($related_cats) {
 					$type_clauses['category_related']['include'] = '%1$s.ResourceId IN ('.implode(',', $related_cats).')';
 					$type_clauses['category_related']['except'] = '%1$s.ResourceId NOT IN ('.implode(',', $related_cats).')';
 				}
 				else
 				{
 					$type_clauses['category_related']['include'] = '0';
 					$type_clauses['category_related']['except'] = '1';
 				}
 				$type_clauses['category_related']['having_filter'] = false;
 			}
 
 			if (in_array('product_related', $types)) {
 				$object->removeFilter('parent_filter');
 
 				$product_id = $event->getEventParam('product_id') ? $event->getEventParam('product_id') : $this->Application->GetVar('p_id');
 
 				$sql = 'SELECT ResourceId
 						FROM ' . $this->Application->getUnitConfig('p')->getTableName() . '
 						WHERE ProductId = ' . $product_id;
 				$resource_id = $this->Conn->GetOne($sql);
 
 				$sql = 'SELECT DISTINCT(TargetId)
 						FROM ' . TABLE_PREFIX . 'CatalogRelationships
 						WHERE SourceId = '.$resource_id.' AND TargetType = 1';
 				$related_cats = $this->Conn->GetCol($sql);
 
 				$related_cats = is_array($related_cats) ? $related_cats : Array();
 
 				$sql = 'SELECT DISTINCT(SourceId)
 						FROM ' . TABLE_PREFIX . 'CatalogRelationships
 						WHERE TargetId = '.$resource_id.' AND SourceType = 1 AND Type = 1';
 				$related_cats2 = $this->Conn->GetCol($sql);
 
 				$related_cats2 = is_array($related_cats2) ? $related_cats2 : Array();
 				$related_cats = array_unique( array_merge( $related_cats2, $related_cats ) );
 
 				if ($related_cats) {
 					$type_clauses['product_related']['include'] = '%1$s.ResourceId IN ('.implode(',', $related_cats).')';
 					$type_clauses['product_related']['except'] = '%1$s.ResourceId NOT IN ('.implode(',', $related_cats).')';
 				}
 				else {
 					$type_clauses['product_related']['include'] = '0';
 					$type_clauses['product_related']['except'] = '1';
 				}
 
 				$type_clauses['product_related']['having_filter'] = false;
 			}
 
 			$type_clauses['menu']['include'] = '%1$s.IsMenu = 1';
 			$type_clauses['menu']['except'] = '%1$s.IsMenu = 0';
 			$type_clauses['menu']['having_filter'] = false;
 
 			/** @var kSearchHelper $search_helper */
 			$search_helper = $this->Application->recallObject('SearchHelper');
 
 			if (in_array('search', $types) || in_array('search', $except_types)) {
 				$event_mapping = Array (
 					'simple'		=>	'OnSimpleSearch',
 					'subsearch'		=>	'OnSubSearch',
 					'advanced'		=>	'OnAdvancedSearch'
 				);
 
 				$keywords = $event->getEventParam('keyword_string');
 				$type = $this->Application->GetVar('search_type', 'simple');
 
 				if ( $keywords ) {
 					// processing keyword_string param of ListProducts tag
 					$this->Application->SetVar('keywords', $keywords);
 					$type = 'simple';
 				}
 
 				$search_event = $event_mapping[$type];
 				$this->$search_event($event);
 
+				/** @var kDBList $object */
 				$object = $event->getObject();
-				/* @var $object kDBList */
 
 				$search_sql = '	FROM ' . $search_helper->getSearchTable() . ' search_result
 								JOIN %1$s ON %1$s.ResourceId = search_result.ResourceId';
 				$sql = str_replace('FROM %1$s', $search_sql, $object->GetPlainSelectSQL());
 
 				$object->SetSelectSQL($sql);
 
 				$object->addCalculatedField('Relevance', 'search_result.Relevance');
 
 				$type_clauses['search']['include'] = '1';
 				$type_clauses['search']['except'] = '0';
 				$type_clauses['search']['having_filter'] = false;
 			}
 
 			$search_helper->SetComplexFilter($event, $type_clauses, implode(',', $types), implode(',', $except_types));
 		}
 
 		/**
 		 * Adds filter, that uses *.VIEW permissions to determine if an item should be shown to a user.
 		 *
 		 * @param kDBList $object Object.
 		 *
 		 * @return void
 		 * @access protected
 		 */
 		protected function applyViewPermissionFilter(kDBList $object)
 		{
 			if ( !$this->Application->ConfigValue('CheckViewPermissionsInCatalog') ) {
 				return;
 			}
 
 			if ( $this->Application->RecallVar('user_id') == USER_ROOT ) {
 				// for "root" CATEGORY.VIEW permission is checked for items lists too
 				$view_perm = 1;
 			}
 			else {
+				/** @var kCountHelper $count_helper */
 				$count_helper = $this->Application->recallObject('CountHelper');
-				/* @var $count_helper kCountHelper */
 
 				list ($view_perm, $view_filter) = $count_helper->GetPermissionClause($object->Prefix, 'perm');
 				$object->addFilter('perm_filter2', $view_filter);
 			}
 
 			$object->addFilter('perm_filter', 'perm.PermId = ' . $view_perm); // check for CATEGORY.VIEW permission
 		}
 
 		/**
 		 * Returns current theme id
 		 *
 		 * @return int
 		 */
 		function _getCurrentThemeId()
 		{
+			/** @var kThemesHelper $themes_helper */
 			$themes_helper = $this->Application->recallObject('ThemesHelper');
-			/* @var $themes_helper kThemesHelper */
 
 			return (int)$themes_helper->getCurrentThemeId();
 		}
 
 		/**
 		 * Returns ID of current item to be edited
 		 * by checking ID passed in get/post as prefix_id
 		 * or by looking at first from selected ids, stored.
 		 * Returned id is also stored in Session in case
 		 * it was explicitly passed as get/post
 		 *
 		 * @param kEvent $event
 		 * @return int
 		 * @access public
 		 */
 		public function getPassedID(kEvent $event)
 		{
 			if ( ($event->Special == 'page') || $this->_isVirtual($event) || ($event->Prefix == 'st') ) {
 				return $this->_getPassedStructureID($event);
 			}
 
 			if ( $this->Application->isAdmin ) {
 				return parent::getPassedID($event);
 			}
 
 			$event->setEventParam(kEvent::FLAG_ID_FROM_REQUEST, true);
 
 			return $this->Application->GetVar('m_cat_id');
 		}
 
 		/**
 		 * Enter description here...
 		 *
 		 * @param kEvent $event
 		 * @return int
 		 */
 		function _getPassedStructureID($event)
 		{
 			static $page_by_template = Array ();
 
 			if ( $event->Special == 'current' ) {
 				$event->setEventParam(kEvent::FLAG_ID_FROM_REQUEST, true);
 
 				return $this->Application->GetVar('m_cat_id');
 			}
 
 			$event->setEventParam('raise_warnings', 0);
 
 			$page_id = parent::getPassedID($event);
 
 			if ( $page_id === false ) {
 				$template = $event->getEventParam('page');
 				if ( !$template ) {
 					$template = $this->Application->GetVar('t');
 				}
 
 				// bug: when template contains "-" symbols (or others, that stripDisallowed will replace) it's not found
 				if ( !array_key_exists($template, $page_by_template) ) {
 					$config = $event->getUnitConfig();
 					$template_crc = kUtil::crc32(mb_strtolower($template));
 
 					$sql = 'SELECT ' . $config->getIDField() . '
 							FROM ' . $config->getTableName() . '
 							WHERE
 								(
 									(NamedParentPathHash = ' . $template_crc . ') OR
 									(`Type` = ' . PAGE_TYPE_TEMPLATE . ' AND CachedTemplateHash = ' . $template_crc . ')
 								) AND (ThemeId = ' . $this->_getCurrentThemeId() . ' OR ThemeId = 0)';
 
 					$page_id = $this->Conn->GetOne($sql);
 				}
 				else {
 					$page_id = $page_by_template[$template];
 				}
 
 				if ( $page_id ) {
 					$page_by_template[$template] = $page_id;
 				}
 			}
 
 			if ( !$page_id && !$this->Application->isAdmin ) {
 				$page_id = $this->Application->GetVar('m_cat_id');
 				$event->setEventParam(kEvent::FLAG_ID_FROM_REQUEST, true);
 			}
 
 			return $page_id;
 		}
 
 		function ParentGetPassedID($event)
 		{
 			return parent::getPassedID($event);
 		}
 
 		/**
 		 * Adds calculates fields for item statuses
 		 *
 		 * @param kCatDBItem $object
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function prepareObject(&$object, kEvent $event)
 		{
 			if ( $this->_isVirtual($event) ) {
 				return;
 			}
 
+			/** @var kDBItem $object */
 			$object = $event->getObject(Array ('skip_autoload' => true));
-			/* @var $object kDBItem */
 
 			$object->addCalculatedField(
 				'IsNew',
 				'	IF(%1$s.NewItem = 2,
 						IF(%1$s.CreatedOn >= (UNIX_TIMESTAMP() - '.
 							$this->Application->ConfigValue('Category_DaysNew').
 							'*3600*24), 1, 0),
 						%1$s.NewItem
 				)');
 		}
 
 		/**
 		 * Checks, that this is virtual page
 		 *
 		 * @param kEvent $event
 		 * @return int
 		 * @access protected
 		 */
 		protected function _isVirtual(kEvent $event)
 		{
 			return strpos($event->Special, '-virtual') !== false;
 		}
 
 		/**
 		 * Gets right special for configuring virtual page
 		 *
 		 * @param kEvent $event
 		 * @return string
 		 * @access protected
 		 */
 		protected function _getCategorySpecial(kEvent $event)
 		{
 			return $this->_isVirtual($event) ? '-virtual' : $event->Special;
 		}
 
 		/**
 		 * Set correct parent path for newly created categories
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterCopyToLive(kEvent $event)
 		{
 			parent::OnAfterCopyToLive($event);
 
+			/** @var CategoriesItem $object */
 			$object = $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true, 'live_table' => true));
-			/* @var $object CategoriesItem */
 
 			$parent_path = false;
 			$object->Load($event->getEventParam('id'));
 
 			if ( $event->getEventParam('temp_id') == 0 ) {
 				if ( $object->isLoaded() ) {
 					// update path only for real categories (not including "Home" root category)
 					$fields_hash = $object->buildParentBasedFields();
 					$this->Conn->doUpdate($fields_hash, $object->TableName, 'CategoryId = ' . $object->GetID());
 					$parent_path = $fields_hash['ParentPath'];
 				}
 			}
 			else {
 				$parent_path = $object->GetDBField('ParentPath');
 			}
 
 			if ( $parent_path ) {
+				/** @var kPermCacheUpdater $cache_updater */
 				$cache_updater = $this->Application->makeClass('kPermCacheUpdater', Array (null, $parent_path));
-				/* @var $cache_updater kPermCacheUpdater */
 
 				$cache_updater->OneStepRun();
 			}
 		}
 
 		/**
 		 * Set cache modification mark if needed
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeDeleteFromLive(kEvent $event)
 		{
 			parent::OnBeforeDeleteFromLive($event);
 
 			$id = $event->getEventParam('id');
 
 			// loading anyway, because this object is needed by "c-perm:OnBeforeDeleteFromLive" event
+			/** @var CategoriesItem $temp_object */
 			$temp_object = $event->getObject(Array ('skip_autoload' => true));
-			/* @var $temp_object CategoriesItem */
 
 			$temp_object->Load($id);
 
 			if ( $id == 0 ) {
 				if ( $temp_object->isLoaded() ) {
 					// new category -> update cache (not loaded when "Home" category)
 					$this->Application->StoreVar('PermCache_UpdateRequired', 1);
 				}
 
 				return ;
 			}
 
 			// existing category was edited, check if in-cache fields are modified
+			/** @var CategoriesItem $live_object */
 			$live_object = $this->Application->recallObject($event->Prefix . '.-item', null, Array ('live_table' => true, 'skip_autoload' => true));
-			/* @var $live_object CategoriesItem */
 
 			$live_object->Load($id);
 			$cached_fields = Array ('l' . $this->Application->GetDefaultLanguageId() . '_Name', 'Filename', 'Template', 'ParentId', 'Priority');
 
 			foreach ($cached_fields as $cached_field) {
 				if ( $live_object->GetDBField($cached_field) != $temp_object->GetDBField($cached_field) ) {
 					// use session instead of REQUEST because of permission editing in category can contain
 					// multiple submits, that changes data before OnSave event occurs
 					$this->Application->StoreVar('PermCache_UpdateRequired', 1);
 					break;
 				}
 			}
 
 			// remember category filename change between temp and live records
 			if ( $temp_object->GetDBField('Filename') != $live_object->GetDBField('Filename') ) {
 				$filename_changes = $this->Application->GetVar($event->Prefix . '_filename_changes', Array ());
 
 				$filename_changes[ $live_object->GetID() ] = Array (
 					'from' => $live_object->GetDBField('Filename'),
 					'to' => $temp_object->GetDBField('Filename')
 				);
 
 				$this->Application->SetVar($event->Prefix . '_filename_changes', $filename_changes);
 			}
 		}
 
 		/**
 		 * Calls kDBEventHandler::OnSave original event
 		 * Used in proj-cms:StructureEventHandler->OnSave
 		 *
 		 * @param kEvent $event
 		 */
 		function parentOnSave($event)
 		{
 			parent::OnSave($event);
 		}
 
 		/**
 		 * Reset root-category flag when new category is created
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnPreCreate(kEvent $event)
 		{
 			// 1. for permission editing of Home category
 			$this->Application->RemoveVar('IsRootCategory_' . $this->Application->GetVar('m_wid'));
 
 			parent::OnPreCreate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			// 2. preset template
 			$category_id = $this->Application->GetVar('m_cat_id');
 			$root_category = $this->Application->getBaseCategory();
 
 			if ( $category_id == $root_category ) {
 				$object->SetDBField('Template', $this->_getDefaultDesign());
 			}
 
 			// 3. set default owner
 			$object->SetDBField('CreatedById', $this->Application->RecallVar('user_id'));
 		}
 
 		/**
 		 * Checks cache update mark and redirect to cache if needed
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnSave(kEvent $event)
 		{
 			// get data from live table before it is overwritten by parent OnSave method call
 			$ids = $this->getSelectedIDs($event, true);
 			$is_editing = implode('', $ids);
 			$old_statuses = $is_editing ? $this->_getCategoryStatus($ids) : Array ();
 
+			/** @var CategoriesItem $object */
 			$object = $event->getObject();
-			/* @var $object CategoriesItem */
 
 			parent::OnSave($event);
 
 			if ( $event->status != kEvent::erSUCCESS ) {
 				return;
 			}
 
 			if ( $this->Application->RecallVar('PermCache_UpdateRequired') ) {
 				$this->Application->RemoveVar('IsRootCategory_' . $this->Application->GetVar('m_wid'));
 			}
 
 			$this->Application->StoreVar('RefreshStructureTree', 1);
 			$this->_resetMenuCache();
 
 			if ( $is_editing ) {
 				// send email event to category owner, when it's status is changed (from admin)
 				$object->SwitchToLive();
 				$new_statuses = $this->_getCategoryStatus($ids);
 				$process_statuses = Array (STATUS_ACTIVE, STATUS_DISABLED);
 
 				foreach ($new_statuses as $category_id => $new_status) {
 					if ( $new_status != $old_statuses[$category_id] && in_array($new_status, $process_statuses) ) {
 						$object->Load($category_id);
 						$email_event = $new_status == STATUS_ACTIVE ? 'CATEGORY.APPROVE' : 'CATEGORY.DENY';
 						$this->Application->emailUser($email_event, $object->GetDBField('CreatedById'), $object->getEmailParams());
 					}
 				}
 			}
 
 			// change opener stack in case if edited category filename was changed
 			$filename_changes = $this->Application->GetVar($event->Prefix . '_filename_changes', Array ());
 
 			if ( $filename_changes ) {
+				/** @var kOpenerStack $opener_stack */
 				$opener_stack = $this->Application->makeClass('kOpenerStack');
-				/* @var $opener_stack kOpenerStack */
 
 				list ($template, $params, $index_file) = $opener_stack->pop();
 
 				foreach ($filename_changes as $change_info) {
 					$template = str_ireplace($change_info['from'], $change_info['to'], $template);
 				}
 
 				$opener_stack->push($template, $params, $index_file);
 				$opener_stack->save();
 			}
 		}
 
 		/**
 		 * Returns statuses of given categories
 		 *
 		 * @param Array $category_ids
 		 * @return Array
 		 */
 		function _getCategoryStatus($category_ids)
 		{
 			$config = $this->getUnitConfig();
 			$id_field = $config->getIDField();
 			$table_name = $config->getTableName();
 
 			$sql = 'SELECT Status, ' . $id_field . '
 					FROM ' . $table_name . '
 					WHERE ' . $id_field . ' IN (' . implode(',', $category_ids) . ')';
 
 			return $this->Conn->GetCol($sql, $id_field);
 		}
 
 		/**
 		 * Creates a new item in temp table and
 		 * stores item id in App vars and Session on success
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnPreSaveCreated(kEvent $event)
 		{
+			/** @var CategoriesItem $object */
 			$object = $event->getObject( Array ('skip_autoload' => true) );
-			/* @var $object CategoriesItem */
 
 			if ( $object->IsRoot() ) {
 				// don't create root category while saving permissions
 				return;
 			}
 
 			parent::OnPreSaveCreated($event);
 		}
 
 		/**
 		 * Deletes sym link to other category
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemDelete(kEvent $event)
 		{
 			parent::OnAfterItemDelete($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$sql = 'UPDATE ' . $object->TableName . '
 					SET SymLinkCategoryId = NULL
 					WHERE SymLinkCategoryId = ' . $object->GetID();
 			$this->Conn->Query($sql);
 
 			// delete direct subscriptions to category, that was deleted
 			$sql = 'SELECT SubscriptionId
 					FROM ' . TABLE_PREFIX . 'SystemEventSubscriptions
 					WHERE CategoryId = ' . $object->GetID();
 			$ids = $this->Conn->GetCol($sql);
 
 			if ( $ids ) {
+				/** @var kTempTablesHandler $temp_handler */
 				$temp_handler = $this->Application->recallObject('system-event-subscription_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event->MasterEvent));
-				/* @var $temp_handler kTempTablesHandler */
 
 				$temp_handler->DeleteItems('system-event-subscription', '', $ids);
 			}
 		}
 
 		/**
 		 * Exclude root categories from deleting
 		 *
 		 * @param kEvent $event
 		 * @param string $type
 		 * @return void
 		 * @access protected
 		 */
 		protected function customProcessing(kEvent $event, $type)
 		{
 			if ( $event->Name == 'OnMassDelete' && $type == 'before' ) {
 				$ids = $event->getEventParam('ids');
 				if ( !$ids || $this->Application->ConfigValue('AllowDeleteRootCats') ) {
 					return;
 				}
 
 				$root_categories = Array ();
 
 				// get module root categories and exclude them
 				foreach ($this->Application->ModuleInfo as $module_info) {
 					$root_categories[] = $module_info['RootCat'];
 				}
 
 				$root_categories = array_unique($root_categories);
 
 				if ( $root_categories && array_intersect($ids, $root_categories) ) {
 					$event->setEventParam('ids', array_diff($ids, $root_categories));
 					$this->Application->StoreVar('root_delete_error', 1);
 				}
 			}
 		}
 
 		/**
 		 * Checks, that given template exists (physically) in given theme
 		 *
 		 * @param string $template
 		 * @param int $theme_id
 		 * @return bool
 		 */
 		function _templateFound($template, $theme_id = null)
 		{
 			static $init_made = false;
 
 			if (!$init_made) {
 				$this->Application->InitParser(true);
 				$init_made = true;
 			}
 
 			if (!isset($theme_id)) {
 				$theme_id = $this->_getCurrentThemeId();
 			}
 
 			$theme_name = $this->_getThemeName($theme_id);
 
 			return $this->Application->TemplatesCache->TemplateExists('theme:' . $theme_name . '/' . $template);
 		}
 
 		/**
 		 * Removes ".tpl" in template path
 		 *
 		 * @param string $template
 		 * @return string
 		 */
 		function _stripTemplateExtension($template)
 		{
 	//		return preg_replace('/\.[^.\\\\\\/]*$/', '', $template);
 
 			return preg_replace('/^[\\/]{0,1}(.*)\.tpl$/', "$1", $template);
 		}
 
 		/**
 		 * Deletes all selected items.
 		 * Automatically recourse into sub-items using temp handler, and deletes sub-items
 		 * by calling its Delete method if sub-item has AutoDelete set to true in its config file
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnMassDelete(kEvent $event)
 		{
 			if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
 				$event->status = kEvent::erFAIL;
 				return;
 			}
 
 			$to_delete = Array ();
 			$ids = $this->StoreSelectedIDs($event);
 			$recycle_bin = $this->Application->ConfigValue('RecycleBinFolder');
 
 			if ( $recycle_bin ) {
+				/** @var CategoriesItem $rb */
 				$rb = $this->Application->recallObject('c.recycle', null, Array ('skip_autoload' => true));
-				/* @var $rb CategoriesItem */
 
 				$rb->Load($recycle_bin);
 
+				/** @var CategoriesItem $cat */
 				$cat = $event->getObject(Array ('skip_autoload' => true));
-				/* @var $cat CategoriesItem */
 
 				foreach ($ids as $id) {
 					$cat->Load($id);
 
 					if ( preg_match('/^' . preg_quote($rb->GetDBField('ParentPath'), '/') . '/', $cat->GetDBField('ParentPath')) ) {
 						// already in "Recycle Bin" -> delete for real
 						$to_delete[] = $id;
 						continue;
 					}
 
 					// just move into "Recycle Bin" category
 					$cat->SetDBField('ParentId', $recycle_bin);
 					$cat->Update();
 				}
 
 				$ids = $to_delete;
 			}
 
 			$event->setEventParam('ids', $ids);
 			$this->customProcessing($event, 'before');
 			$ids = $event->getEventParam('ids');
 
 			if ( $ids ) {
+				/** @var kRecursiveHelper $recursive_helper */
 				$recursive_helper = $this->Application->recallObject('RecursiveHelper');
-				/* @var $recursive_helper kRecursiveHelper */
 
 				foreach ($ids as $id) {
 					$recursive_helper->DeleteCategory($id, $event->Prefix);
 				}
 			}
 
 			$this->clearSelectedIDs($event);
 
 			$this->_ensurePermCacheRebuild($event);
 		}
 
 		/**
 		 * Add selected items to clipboard with mode = COPY (CLONE)
 		 *
 		 * @param kEvent $event
 		 */
 		function OnCopy($event)
 		{
 			$this->Application->RemoveVar('clipboard');
 
+			/** @var kClipboardHelper $clipboard_helper */
 			$clipboard_helper = $this->Application->recallObject('ClipboardHelper');
-			/* @var $clipboard_helper kClipboardHelper */
 
 			$clipboard_helper->setClipboard($event, 'copy', $this->StoreSelectedIDs($event));
 			$this->clearSelectedIDs($event);
 		}
 
 		/**
 		 * Add selected items to clipboard with mode = CUT
 		 *
 		 * @param kEvent $event
 		 */
 		function OnCut($event)
 		{
 			$this->Application->RemoveVar('clipboard');
 
+			/** @var kClipboardHelper $clipboard_helper */
 			$clipboard_helper = $this->Application->recallObject('ClipboardHelper');
-			/* @var $clipboard_helper kClipboardHelper */
 
 			$clipboard_helper->setClipboard($event, 'cut', $this->StoreSelectedIDs($event));
 			$this->clearSelectedIDs($event);
 		}
 
 		/**
 		 * Controls all item paste operations. Can occur only with filled clipboard.
 		 *
 		 * @param kEvent $event
 		 */
 		function OnPasteClipboard($event)
 		{
 			$clipboard = unserialize( $this->Application->RecallVar('clipboard') );
 			foreach ($clipboard as $prefix => $clipboard_data) {
 				$paste_event = new kEvent($prefix.':OnPaste', Array('clipboard_data' => $clipboard_data));
 				$this->Application->HandleEvent($paste_event);
 
 				$event->copyFrom($paste_event);
 			}
 		}
 
 		/**
 		 * Checks permission for OnPaste event
 		 *
 		 * @param kEvent $event
 		 * @return bool
 		 */
 		function _checkPastePermission($event)
 		{
+			/** @var kPermissionsHelper $perm_helper */
 			$perm_helper = $this->Application->recallObject('PermissionsHelper');
-			/* @var $perm_helper kPermissionsHelper */
 
 			$category_id = $this->Application->GetVar('m_cat_id');
 			if ($perm_helper->AddCheckPermission($category_id, $event->Prefix) == 0) {
 				// no items left for editing -> no permission
 				return $perm_helper->finalizePermissionCheck($event, false);
 			}
 
 			return true;
 		}
 
 		/**
 		 * Paste categories with sub-items from clipboard
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnPaste($event)
 		{
 			if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) || !$this->_checkPastePermission($event) ) {
 				$event->status = kEvent::erFAIL;
 				return;
 			}
 
 			$clipboard_data = $event->getEventParam('clipboard_data');
 
 			if ( !$clipboard_data['cut'] && !$clipboard_data['copy'] ) {
 				return;
 			}
 
 			// 1. get ParentId of moved category(-es) before it gets updated!!!)
 			$source_category_id = 0;
 			$config = $event->getUnitConfig();
 			$id_field = $config->getIDField();
 			$table_name = $config->getTableName();
 
 			if ( $clipboard_data['cut'] ) {
 				$sql = 'SELECT ParentId
 						FROM ' . $table_name . '
 						WHERE ' . $id_field . ' = ' . $clipboard_data['cut'][0];
 				$source_category_id = $this->Conn->GetOne($sql);
 			}
 
+			/** @var kRecursiveHelper $recursive_helper */
 			$recursive_helper = $this->Application->recallObject('RecursiveHelper');
-			/* @var $recursive_helper kRecursiveHelper */
 
 			if ( $clipboard_data['cut'] ) {
 				$recursive_helper->MoveCategories($clipboard_data['cut'], $this->Application->GetVar('m_cat_id'));
 			}
 
 			if ( $clipboard_data['copy'] ) {
 				// don't allow to copy/paste system OR theme-linked virtual pages
 
 				$sql = 'SELECT ' . $id_field . '
 						FROM ' . $table_name . '
 						WHERE ' . $id_field . ' IN (' . implode(',', $clipboard_data['copy']) . ') AND (`Type` = ' . PAGE_TYPE_VIRTUAL . ') AND (ThemeId = 0)';
 				$allowed_ids = $this->Conn->GetCol($sql);
 
 				if ( !$allowed_ids ) {
 					return;
 				}
 
 				foreach ($allowed_ids as $id) {
 					$recursive_helper->PasteCategory($id, $event->Prefix);
 				}
 			}
 
+			/** @var kPriorityHelper $priority_helper */
 			$priority_helper = $this->Application->recallObject('PriorityHelper');
-			/* @var $priority_helper kPriorityHelper */
 
 			if ( $clipboard_data['cut'] ) {
 				$ids = $priority_helper->recalculatePriorities($event, 'ParentId = ' . $source_category_id);
 
 				if ( $ids ) {
 					$priority_helper->massUpdateChanged($event->Prefix, $ids);
 				}
 			}
 
 			// recalculate priorities of newly pasted categories in destination category
 			$parent_id = $this->Application->GetVar('m_cat_id');
 			$ids = $priority_helper->recalculatePriorities($event, 'ParentId = ' . $parent_id);
 
 			if ( $ids ) {
 				$priority_helper->massUpdateChanged($event->Prefix, $ids);
 			}
 
 			if ( $clipboard_data['cut'] || $clipboard_data['copy'] ) {
 				$this->_ensurePermCacheRebuild($event);
 			}
 		}
 
 		/**
 		 * Ensures, that category permission cache is rebuild when category is added/edited/deleted
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function _ensurePermCacheRebuild(kEvent $event)
 		{
 			$this->Application->StoreVar('PermCache_UpdateRequired', 1);
 			$this->Application->StoreVar('RefreshStructureTree', 1);
 		}
 
 		/**
 		 * Occurs when pasting category
 		 *
 		 * @param kEvent $event
 		 */
 		/*function OnCatPaste($event)
 		{
 			$inp_clipboard = $this->Application->RecallVar('ClipBoard');
 			$inp_clipboard = explode('-', $inp_clipboard, 2);
 
 			if($inp_clipboard[0] == 'COPY')
 			{
 				$config = $event->getUnitConfig();
 				$cat_ids = $event->getEventParam('cat_ids');
 				$saved_cat_id = $this->Application->GetVar('m_cat_id');
 
 				$ids_sql = 'SELECT ' . $config->getIDField() . '
 							FROM ' . $config->getTableName() . '
 							WHERE ResourceId IN (%s)';
 
 				$resource_ids_sql = 'SELECT ItemResourceId FROM '.TABLE_PREFIX.'CategoryItems WHERE CategoryId = %s AND PrimaryCat = 1';
 
 				$object = $this->Application->recallObject($event->Prefix.'.item', $event->Prefix, Array('skip_autoload' => true));
 
 				foreach($cat_ids as $source_cat => $dest_cat)
 				{
 					$item_resource_ids = $this->Conn->GetCol( sprintf($resource_ids_sql, $source_cat) );
 					if(!$item_resource_ids) continue;
 
 					$this->Application->SetVar('m_cat_id', $dest_cat);
 					$item_ids = $this->Conn->GetCol( sprintf($ids_sql, implode(',', $item_resource_ids) ) );
 
 					$temp = $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
 					if($item_ids) $temp->CloneItems($event->Prefix, $event->Special, $item_ids);
 				}
 
 				$this->Application->SetVar('m_cat_id', $saved_cat_id);
 			}
 		}*/
 
 		/**
 		 * Clears clipboard content
 		 *
 		 * @param kEvent $event
 		 */
 		function OnClearClipboard($event)
 		{
 			$this->Application->RemoveVar('clipboard');
 		}
 
 		/**
 		 * Sets correct status for new categories created on front-end
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemCreate(kEvent $event)
 		{
 			parent::OnBeforeItemCreate($event);
 
+			/** @var CategoriesItem $object */
 			$object = $event->getObject();
-			/* @var $object CategoriesItem */
 
 			if ( $object->GetDBField('ParentId') <= 0 ) {
 				// no parent category - use current (happens during import)
 				$object->SetDBField('ParentId', $this->Application->GetVar('m_cat_id'));
 			}
 
 			$this->_beforeItemChange($event);
 
 			if ( $this->Application->isAdmin || $event->Prefix == 'st' ) {
 				// don't check category permissions when auto-creating structure pages
 				return ;
 			}
 
+			/** @var kPermissionsHelper $perm_helper */
 			$perm_helper = $this->Application->recallObject('PermissionsHelper');
-			/* @var $perm_helper kPermissionsHelper */
 
 			$new_status = false;
 			$category_id = $this->Application->GetVar('m_cat_id');
 
 			if ( $perm_helper->CheckPermission('CATEGORY.ADD', 0, $category_id) ) {
 				$new_status = STATUS_ACTIVE;
 			}
 			else {
 				if ( $perm_helper->CheckPermission('CATEGORY.ADD.PENDING', 0, $category_id) ) {
 					$new_status = STATUS_PENDING;
 				}
 			}
 
 			if ( $new_status ) {
 				$object->SetDBField('Status', $new_status);
 
 				// don't forget to set Priority for suggested from Front-End categories
 				$min_priority = $this->_getNextPriority($object->GetDBField('ParentId'), $object->TableName);
 				$object->SetDBField('Priority', $min_priority);
 			}
 			else {
 				$event->status = kEvent::erPERM_FAIL;
 				return ;
 			}
 		}
 
 		/**
 		 * Returns next available priority for given category from given table
 		 *
 		 * @param int $category_id
 		 * @param string $table_name
 		 * @return int
 		 */
 		function _getNextPriority($category_id, $table_name)
 		{
 			$sql = 'SELECT MIN(Priority)
 					FROM ' . $table_name . '
 					WHERE ParentId = ' . $category_id;
 			return (int)$this->Conn->GetOne($sql) - 1;
 		}
 
 		/**
 		 * Sets correct status for new categories created on front-end
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemUpdate(kEvent $event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
 			$this->_beforeItemChange($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			if ( $object->GetChangedFields() ) {
 				$object->SetDBField('ModifiedById', $this->Application->RecallVar('user_id'));
 			}
 		}
 
 		/**
 		 * Creates needed sql query to load item,
 		 * if no query is defined in config for
 		 * special requested, then use list query
 		 *
 		 * @param kEvent $event
 		 * @return string
 		 * @access protected
 		 */
 		protected function ItemPrepareQuery(kEvent $event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$sqls = $object->getFormOption('ItemSQLs', Array ());
 			$category_special = $this->_getCategorySpecial($event);
 			$special = isset($sqls[$category_special]) ? $category_special : '';
 
 			// preferred special not found in ItemSQLs -> use analog from ListSQLs
 
 			return isset($sqls[$special]) ? $sqls[$special] : $this->ListPrepareQuery($event);
 		}
 
 		/**
 		 * Creates needed sql query to load list,
 		 * if no query is defined in config for
 		 * special requested, then use default
 		 * query
 		 *
 		 * @param kEvent $event
 		 * @return string
 		 * @access protected
 		 */
 		protected function ListPrepareQuery(kEvent $event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$special = $this->_getCategorySpecial($event);
 			$sqls = $object->getFormOption('ListSQLs', Array ());
 
 			return $sqls[array_key_exists($special, $sqls) ? $special : ''];
 		}
 
 		/**
 		 * Performs redirect to correct suggest confirmation template
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnCreate(kEvent $event)
 		{
 			parent::OnCreate($event);
 
 			if ( $this->Application->isAdmin || $event->status != kEvent::erSUCCESS ) {
 				// don't sent email or rebuild cache directly after category is created by admin
 				return;
 			}
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
+			/** @var kPermCacheUpdater $cache_updater */
 			$cache_updater = $this->Application->makeClass('kPermCacheUpdater', Array (null, $object->GetDBField('ParentPath')));
-			/* @var $cache_updater kPermCacheUpdater */
 
 			$cache_updater->OneStepRun();
 
 			$is_active = ($object->GetDBField('Status') == STATUS_ACTIVE);
 
 			$next_template = $is_active ? 'suggest_confirm_template' : 'suggest_pending_confirm_template';
 			$event->redirect = $this->Application->GetVar($next_template);
 			$event->SetRedirectParam('opener', 's');
 
 			// send email events
 			$send_params = $object->getEmailParams();
 			$event_suffix = $is_active ? 'ADD' : 'ADD.PENDING';
 			$perm_prefix = $event->getUnitConfig()->getPermItemPrefix();
 
 			$this->Application->emailUser($perm_prefix . '.' . $event_suffix, $object->GetDBField('CreatedById'), $send_params);
 			$this->Application->emailAdmin($perm_prefix . '.' . $event_suffix, null, $send_params);
 		}
 
 		/**
 		 * Returns current per-page setting for list
 		 *
 		 * @param kEvent $event
 		 * @return int
 		 * @access protected
 		 */
 		protected function getPerPage(kEvent $event)
 		{
 			if ( !$this->Application->isAdmin ) {
 				$same_special = $event->getEventParam('same_special');
 				$event->setEventParam('same_special', true);
 
 				$per_page = parent::getPerPage($event);
 
 				$event->setEventParam('same_special', $same_special);
 			}
 
 			return parent::getPerPage($event);
 		}
 
 		/**
 		 * Set's correct page for list based on data provided with event
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
 		protected function SetPagination(kEvent $event)
 		{
 			parent::SetPagination($event);
 
 			if ( !$this->Application->isAdmin ) {
 				$page_var = $event->getEventParam('page_var');
 
 				if ( $page_var !== false ) {
 					$page = $this->Application->GetVar($page_var);
 
 					if ( is_numeric($page) ) {
+						/** @var kDBList $object */
 						$object = $event->getObject();
-						/* @var $object kDBList */
 
 						$object->SetPage($page);
 					}
 				}
 			}
 		}
 
 		/**
 		 * Apply same processing to each item being selected in grid
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function iterateItems(kEvent $event)
 		{
 			if ( $event->Name != 'OnMassApprove' && $event->Name != 'OnMassDecline' ) {
 				parent::iterateItems($event);
 			}
 
 			if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
 				$event->status = kEvent::erFAIL;
 				return;
 			}
 
+			/** @var CategoriesItem $object */
 			$object = $event->getObject(Array ('skip_autoload' => true));
-			/* @var $object CategoriesItem */
 
 			$ids = $this->StoreSelectedIDs($event);
 
 			if ( $ids ) {
 				$propagate_category_status = $this->Application->GetVar('propagate_category_status');
 				$status_field = $event->getUnitConfig()->getStatusField(true);
 
 				foreach ($ids as $id) {
 					$object->Load($id);
 					$object->SetDBField($status_field, $event->Name == 'OnMassApprove' ? 1 : 0);
 
 					if ( $object->Update() ) {
 						if ( $propagate_category_status ) {
 							$sql = 'UPDATE ' . $object->TableName . '
 									SET ' . $status_field . ' = ' . $object->GetDBField($status_field) . '
 									WHERE TreeLeft BETWEEN ' . $object->GetDBField('TreeLeft') . ' AND ' . $object->GetDBField('TreeRight');
 							$this->Conn->Query($sql);
 						}
 
 						$email_event = $event->Name == 'OnMassApprove' ? 'CATEGORY.APPROVE' : 'CATEGORY.DENY';
 						$this->Application->emailUser($email_event, $object->GetDBField('CreatedById'), $object->getEmailParams());
 					}
 				}
 			}
 
 			$this->clearSelectedIDs($event);
 			$this->Application->StoreVar('RefreshStructureTree', 1);
 		}
 
 		/**
 		 * Checks, that currently loaded item is allowed for viewing (non permission-based)
 		 *
 		 * @param kEvent $event
 		 * @return bool
 		 * @access protected
 		 */
 		protected function checkItemStatus(kEvent $event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			if ( !$object->isLoaded() ) {
 				return true;
 			}
 
 			if ( $object->GetDBField('Status') != STATUS_ACTIVE && $object->GetDBField('Status') != 4 ) {
 				if ( !$object->GetDBField('DirectLinkEnabled') || !$object->GetDBField('DirectLinkAuthKey') ) {
 					return false;
 				}
 
 				return $this->Application->GetVar('authkey') == $object->GetDBField('DirectLinkAuthKey');
 			}
 
 			return true;
 		}
 
 		/**
 		 * Set's correct sorting for list based on data provided with event
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
 		protected function SetSorting(kEvent $event)
 		{
 			$types = $event->getEventParam('types');
 			$types = $types ? explode(',', $types) : Array ();
 
 			if ( in_array('search', $types) ) {
 				$event->setPseudoClass('_List');
 
+				/** @var kDBList $object */
 				$object = $event->getObject();
-				/* @var $object kDBList */
 
 				// 1. no user sorting - sort by relevance
 				$default_sortings = parent::_getDefaultSorting($event);
 				$default_sorting = key($default_sortings['Sorting']) . ',' . current($default_sortings['Sorting']);
 
 				if ( $object->isMainList() ) {
 					$sort_by = $this->Application->GetVar('sort_by', '');
 
 					if ( !$sort_by ) {
 						$this->Application->SetVar('sort_by', 'Relevance,desc|' . $default_sorting);
 					}
 					elseif ( strpos($sort_by, 'Relevance,') !== false ) {
 						$this->Application->SetVar('sort_by', $sort_by . '|' . $default_sorting);
 					}
 				}
 				else {
 					$sorting_settings = $this->getListSetting($event, 'Sortings');
 					$sort_by = trim(getArrayValue($sorting_settings, 'Sort1') . ',' . getArrayValue($sorting_settings, 'Sort1_Dir'), ',');
 
 					if ( !$sort_by ) {
 						$event->setEventParam('sort_by', 'Relevance,desc|' . $default_sorting);
 					}
 					elseif ( strpos($sort_by, 'Relevance,') !== false ) {
 						$event->setEventParam('sort_by', $sort_by . '|' . $default_sorting);
 					}
 				}
 
 				$this->_removeForcedSortings($event);
 			}
 
 			parent::SetSorting($event);
 		}
 
 		/**
 		 * Removes forced sortings
 		 *
 		 * @param kEvent $event
 		 */
 		protected function _removeForcedSortings(kEvent $event)
 		{
 			$config = $event->getUnitConfig();
 
 			foreach ($config->getListSortingSpecials() as $special) {
 				$list_sortings = $config->getListSortingsBySpecial($special);
 				unset($list_sortings['ForcedSorting']);
 				$config->setListSortingsBySpecial('', $list_sortings);
 			}
 		}
 
 		/**
 		 * Default sorting in search results only comes from relevance field
 		 *
 		 * @param kEvent $event
 		 * @return Array
 		 * @access protected
 		 */
 		protected function _getDefaultSorting(kEvent $event)
 		{
 			$types = $event->getEventParam('types');
 			$types = $types ? explode(',', $types) : Array ();
 
 			return in_array('search', $types) ? Array () : parent::_getDefaultSorting($event);
 		}
 
 		// ============= for cms page processing =======================
 
 		/**
 		 * Returns default design template
 		 *
 		 * @return string
 		 */
 		function _getDefaultDesign()
 		{
 			$default_design = trim($this->Application->ConfigValue('cms_DefaultDesign'), '/');
 
 			if (!$default_design) {
 				// theme-based alias for default design
 				return '#default_design#';
 			}
 
 			if (strpos($default_design, '#') === false) {
 				// real template, not alias, so prefix with "/"
 				return '/' . $default_design;
 			}
 
 			// alias
 			return $default_design;
 		}
 
 		/**
 		 * Returns default design based on given virtual template (used from kApplication::Run)
 		 *
 		 * @param string $t
 		 * @return string
 		 * @access public
 		 */
 		public function GetDesignTemplate($t = null)
 		{
 			if ( !isset($t) ) {
 				$t = $this->Application->GetVar('t');
 			}
 
+			/** @var CategoriesItem $page */
 			$page = $this->Application->recallObject($this->Prefix . '.-virtual', null, Array ('page' => $t));
-			/* @var $page CategoriesItem */
 
 			if ( $page->isLoaded() ) {
 				$real_t = $page->GetDBField('CachedTemplate');
 				$this->Application->SetVar('m_cat_id', $page->GetDBField('CategoryId'));
 
 				if ( $page->GetDBField('FormId') ) {
 					$this->Application->SetVar('form_id', $page->GetDBField('FormId'));
 				}
 			}
 			else {
 				$this->Application->UrlManager->show404();
 			}
 
 			// replace alias in form #alias_name# to actual template used in this theme
 			if ( $this->Application->isAdmin ) {
+				/** @var kThemesHelper $themes_helper */
 				$themes_helper = $this->Application->recallObject('ThemesHelper');
-				/* @var $themes_helper kThemesHelper */
 
 				// only, used when in "Design Mode"
 				$this->Application->SetVar('theme.current_id', $themes_helper->getCurrentThemeId());
 			}
 
+			/** @var kDBItem $theme */
 			$theme = $this->Application->recallObject('theme.current');
-			/* @var $theme kDBItem */
 
 			$template = $theme->GetField('TemplateAliases', $real_t);
 
 			if ( $template ) {
 				return $template;
 			}
 
 			return $real_t;
 		}
 
 		/**
 		 * Sets category id based on found template (used from kApplication::Run)
 		 *
 		 * @deprecated
 		 */
 		/*function SetCatByTemplate()
 		{
 			$t = $this->Application->GetVar('t');
 			$page = $this->Application->recallObject($this->Prefix . '.-virtual');
 
 			if ( $page->isLoaded() ) {
 				$this->Application->SetVar('m_cat_id', $page->GetDBField('CategoryId'));
 			}
 		}*/
 
 		/**
 		 * Prepares template paths
 		 *
 		 * @param kEvent $event
 		 */
 		function _beforeItemChange($event)
 		{
+			/** @var CategoriesItem $object */
 			$object = $event->getObject();
-			/* @var $object CategoriesItem */
 
 			$now = time();
 
 			if ( !$this->Application->isDebugMode() && strpos($event->Special, 'rebuild') === false ) {
 				$object->SetDBField('Type', $object->GetOriginalField('Type'));
 				$object->SetDBField('Protected', $object->GetOriginalField('Protected'));
 
 				if ( $object->GetDBField('Protected') ) {
 					// some fields are read-only for protected pages, when debug mode is off
 					$object->SetDBField('AutomaticFilename', $object->GetOriginalField('AutomaticFilename'));
 					$object->SetDBField('Filename', $object->GetOriginalField('Filename'));
 					$object->SetDBField('Status', $object->GetOriginalField('Status'));
 				}
 			}
 
 			$object->checkFilename();
 			$object->generateFilename();
 
 			// Don't allow creating records on behalf of another user.
 			if ( !$this->Application->isAdminUser && !defined('CRON') ) {
 				$object->SetDBField('CreatedById', $object->GetOriginalField('CreatedById'));
 			}
 
 			// Auto-assign records to currently logged-in user.
 			if ( !$object->GetDBField('CreatedById') ) {
 				$object->SetDBField('CreatedById', $this->Application->RecallVar('user_id'));
 			}
 
 			if ($object->GetChangedFields()) {
 				$object->SetDBField('Modified_date', $now);
 				$object->SetDBField('Modified_time', $now);
 			}
 
 			$object->setRequired('PageCacheKey', $object->GetDBField('OverridePageCacheKey'));
 			$object->SetDBField('Template', $this->_stripTemplateExtension( $object->GetDBField('Template') ));
 
 			if ($object->GetDBField('Type') == PAGE_TYPE_TEMPLATE) {
 				if (!$this->_templateFound($object->GetDBField('Template'), $object->GetDBField('ThemeId'))) {
 					$object->SetError('Template', 'template_file_missing', 'la_error_TemplateFileMissing');
 				}
 			}
 
 			$this->_saveTitleField($object, 'Title');
 			$this->_saveTitleField($object, 'MenuTitle');
 
 			$root_category = $this->Application->getBaseCategory();
 
 			if ( file_exists(FULL_PATH . '/themes') && ($object->GetDBField('ParentId') == $root_category) && ($object->GetDBField('Template') == CATEGORY_TEMPLATE_INHERIT) ) {
 				// there are themes + creating top level category
 				$object->SetError('Template', 'no_inherit');
 			}
 
 			if ( !$this->Application->isAdminUser && $object->isVirtualField('cust_RssSource') ) {
 				// only administrator can set/change "cust_RssSource" field
 
 				if ($object->GetDBField('cust_RssSource') != $object->GetOriginalField('cust_RssSource')) {
 					$object->SetError('cust_RssSource', 'not_allowed', 'la_error_OperationNotAllowed');
 				}
 			}
 
 			if ( !$object->GetDBField('DirectLinkAuthKey') ) {
 				$key_parts = Array (
 					$object->GetID(),
 					$object->GetDBField('ParentId'),
 					$object->GetField('Name'),
 					'b38'
 				);
 
 				$object->SetDBField('DirectLinkAuthKey', substr( md5( implode(':', $key_parts) ), 0, 20 ));
 			}
 		}
 
 		/**
 		 * Sets page name to requested field in case when:
 		 * 1. page was auto created (through theme file rebuild)
 		 * 2. requested field is empty
 		 *
 		 * @param kDBItem $object
 		 * @param string $field
 		 * @author Alex
 		 */
 		function _saveTitleField(&$object, $field)
 		{
 			$value = $object->GetField($field, 'no_default'); // current value of target field
 
+			/** @var kMultiLanguage $ml_formatter */
 			$ml_formatter = $this->Application->recallObject('kMultiLanguage');
-			/* @var $ml_formatter kMultiLanguage */
 
 			$src_field = $ml_formatter->LangFieldName('Name');
 			$dst_field = $ml_formatter->LangFieldName($field);
 
 			$dst_field_not_changed = $object->GetOriginalField($dst_field) == $value;
 
 			if ($value == '' || preg_match('/^_Auto: (.*)/', $value) || (($object->GetOriginalField($src_field) == $value) && $dst_field_not_changed)) {
 				// target field is empty OR target field value starts with "_Auto: " OR (source field value
 				// before change was equals to current target field value AND target field value wasn't changed)
 				$object->SetField($dst_field, $object->GetField($src_field));
 			}
 		}
 
 		/**
 		 * Don't allow to delete system pages, when not in debug mode
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemDelete(kEvent $event)
 		{
 			parent::OnBeforeItemDelete($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			if ( $object->GetDBField('Protected') && !$this->Application->isDebugMode(false) ) {
 				$event->status = kEvent::erFAIL;
 			}
 		}
 
 		/**
 		 * Creates category based on given TPL file
 		 *
 		 * @param CategoriesItem $object
 		 * @param string $template
 		 * @param int $theme_id
 		 * @param int $system_mode
 		 * @param array $template_info
 		 * @return bool
 		 */
 		function _prepareAutoPage(&$object, $template, $theme_id = null, $system_mode = SMS_MODE_AUTO, $template_info = Array ())
 		{
 			$template = $this->_stripTemplateExtension($template);
 
 			if ($system_mode == SMS_MODE_AUTO) {
 				$page_type = $this->_templateFound($template, $theme_id) ? PAGE_TYPE_TEMPLATE : PAGE_TYPE_VIRTUAL;
 			}
 			else {
 				$page_type = $system_mode == SMS_MODE_FORCE ? PAGE_TYPE_TEMPLATE : PAGE_TYPE_VIRTUAL;
 			}
 
 			if (($page_type == PAGE_TYPE_TEMPLATE) && ($template_info === false)) {
 				// do not auto-create system pages, when browsing through site
 				return false;
 			}
 
 			if (!isset($theme_id)) {
 				$theme_id = $this->_getCurrentThemeId();
 			}
 
 			$root_category = $this->Application->getBaseCategory();
 			$page_category = $this->Application->GetVar('m_cat_id');
 			if (!$page_category) {
 				$page_category = $root_category;
 				$this->Application->SetVar('m_cat_id', $page_category);
 			}
 
 			if (($page_type == PAGE_TYPE_VIRTUAL) && (strpos($template, '/') !== false)) {
 				// virtual page, but have "/" in template path -> create it's path
 				$category_path = explode('/', $template);
 				$template = array_pop($category_path);
 
 				$page_category = $this->_getParentCategoryFromPath($category_path, $root_category, $theme_id);
 			}
 
 			$page_name = ($page_type == PAGE_TYPE_TEMPLATE) ? '_Auto: ' . $template : $template;
 			$page_description = '';
 
 			if ($page_type == PAGE_TYPE_TEMPLATE) {
 				$design_template = strtolower($template); // leading "/" not added !
 				if ($template_info) {
 					if (array_key_exists('name', $template_info) && $template_info['name']) {
 						$page_name = $template_info['name'];
 					}
 
 					if (array_key_exists('desc', $template_info) && $template_info['desc']) {
 						$page_description = $template_info['desc'];
 					}
 
 					if (array_key_exists('section', $template_info) && $template_info['section']) {
 						// this will override any global "m_cat_id"
 						$page_category = $this->_getParentCategoryFromPath(explode('||', $template_info['section']), $root_category, $theme_id);
 					}
 				}
 			}
 			else {
 				$design_template = $this->_getDefaultDesign(); // leading "/" added !
 			}
 
 			$object->Clear();
 			$object->SetDBField('ParentId', $page_category);
 			$object->SetDBField('Type', $page_type);
 			$object->SetDBField('Protected', 1); // $page_type == PAGE_TYPE_TEMPLATE
 
 			$object->SetDBField('IsMenu', 0);
 			$object->SetDBField('ThemeId', $theme_id);
 
 			// put all templates to then end of list (in their category)
 			$min_priority = $this->_getNextPriority($page_category, $object->TableName);
 			$object->SetDBField('Priority', $min_priority);
 
 			$object->SetDBField('Template', $design_template);
 			$object->SetDBField('CachedTemplate', $design_template);
 
 			$primary_language = $this->Application->GetDefaultLanguageId();
 			$current_language = $this->Application->GetVar('m_lang');
 			$object->SetDBField('l' . $primary_language . '_Name', $page_name);
 			$object->SetDBField('l' . $current_language . '_Name', $page_name);
 			$object->SetDBField('l' . $primary_language . '_Description', $page_description);
 			$object->SetDBField('l' . $current_language . '_Description', $page_description);
 
 			return $object->Create();
 		}
 
 		function _getParentCategoryFromPath($category_path, $base_category, $theme_id = null)
 		{
 			static $category_ids = Array ();
 
 			if (!$category_path) {
 				return $base_category;
 			}
 
 			if (array_key_exists(implode('||', $category_path), $category_ids)) {
 				return $category_ids[ implode('||', $category_path) ];
 			}
 
 			$backup_category_id = $this->Application->GetVar('m_cat_id');
 
+			/** @var CategoriesItem $object */
 			$object = $this->Application->recallObject($this->Prefix . '.rebuild-path', null, Array ('skip_autoload' => true));
-			/* @var $object CategoriesItem */
 
 			$parent_id = $base_category;
 
+			/** @var kFilenamesHelper $filenames_helper */
 			$filenames_helper = $this->Application->recallObject('FilenamesHelper');
-			/* @var $filenames_helper kFilenamesHelper */
 
 			$safe_category_path = array_map(Array (&$filenames_helper, 'replaceSequences'), $category_path);
 
 			foreach ($category_path as $category_order => $category_name) {
 				$this->Application->SetVar('m_cat_id', $parent_id);
 
 				// get virtual category first, when possible
 				$sql = 'SELECT ' . $object->IDField . '
 						FROM ' . $object->TableName . '
 						WHERE
 							(
 								Filename = ' . $this->Conn->qstr($safe_category_path[$category_order]) . ' OR
 								Filename = ' . $this->Conn->qstr( $filenames_helper->replaceSequences('_Auto: ' . $category_name) ) . '
 							) AND
 							(ParentId = ' . $parent_id . ') AND
 							(ThemeId = 0 OR ThemeId = ' . $theme_id . ')
 						ORDER BY ThemeId ASC';
 				$parent_id = $this->Conn->GetOne($sql);
 
 				if ($parent_id === false) {
 					// page not found
 					$template = implode('/', array_slice($safe_category_path, 0, $category_order + 1));
 
 					// don't process system templates in sub-categories
 					$system = $this->_templateFound($template, $theme_id) && (strpos($template, '/') === false);
 
 					if (!$this->_prepareAutoPage($object, $category_name, $theme_id, $system ? SMS_MODE_FORCE : false)) {
 						// page was not created
 						break;
 					}
 
 					$parent_id = $object->GetID();
 				}
 			}
 
 			$this->Application->SetVar('m_cat_id', $backup_category_id);
 			$category_ids[ implode('||', $category_path) ] = $parent_id;
 
 			return $parent_id;
 		}
 
 		/**
 		 * Returns theme name by it's id. Used in structure page creation.
 		 *
 		 * @param int $theme_id
 		 * @return string
 		 */
 		function _getThemeName($theme_id)
 		{
 			static $themes = null;
 
 			if (!isset($themes)) {
 				$theme_config = $this->Application->getUnitConfig('theme');
 				$id_field = $theme_config->getIDField();
 				$table_name = $theme_config->getTableName();
 
 				$sql = 'SELECT Name, ' . $id_field . '
 						FROM ' . $table_name . '
 						WHERE Enabled = 1';
 				$themes = $this->Conn->GetCol($sql, $id_field);
 			}
 
 			return array_key_exists($theme_id, $themes) ? $themes[$theme_id] : false;
 		}
 
 		/**
 		 * Resets SMS-menu cache
 		 *
 		 * @param kEvent $event
 		 */
 		function OnResetCMSMenuCache($event)
 		{
 			if ($this->Application->GetVar('ajax') == 'yes') {
 				$event->status = kEvent::erSTOP;
 			}
 
 			$this->_resetMenuCache();
 			$event->SetRedirectParam('action_completed', 1);
 		}
 
 		/**
 		 * Performs reset of category-related caches (menu, structure dropdown, template mapping)
 		 *
 		 * @return void
 		 * @access protected
 		 */
 		protected function _resetMenuCache()
 		{
 			// reset cms menu cache (all variables are automatically rebuild, when missing)
 			if ($this->Application->isCachingType(CACHING_TYPE_MEMORY)) {
 				$this->Application->rebuildCache('master:cms_menu', kCache::REBUILD_LATER, CacheSettings::$cmsMenuRebuildTime);
 				$this->Application->rebuildCache('master:StructureTree', kCache::REBUILD_LATER, CacheSettings::$structureTreeRebuildTime);
 				$this->Application->rebuildCache('master:template_mapping', kCache::REBUILD_LATER, CacheSettings::$templateMappingRebuildTime);
 			}
 			else {
 				$this->Application->rebuildDBCache('cms_menu', kCache::REBUILD_LATER, CacheSettings::$cmsMenuRebuildTime);
 				$this->Application->rebuildDBCache('StructureTree', kCache::REBUILD_LATER, CacheSettings::$structureTreeRebuildTime);
 				$this->Application->rebuildDBCache('template_mapping', kCache::REBUILD_LATER, CacheSettings::$templateMappingRebuildTime);
 			}
 		}
 
 		/**
 		 * Updates structure config
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterConfigRead(kEvent $event)
 		{
 			parent::OnAfterConfigRead($event);
 
 			if (defined('IS_INSTALL') && IS_INSTALL) {
 				// skip any processing, because Categories table doesn't exists until install is finished
 				$this->addViewPermissionJoin($event);
 
 				return ;
 			}
 
+			/** @var SiteConfigHelper $site_config_helper */
 			$site_config_helper = $this->Application->recallObject('SiteConfigHelper');
-			/* @var $site_config_helper SiteConfigHelper */
 
 			$settings = $site_config_helper->getSettings();
 
 			$root_category = $this->Application->getBaseCategory();
 
 			$config = $event->getUnitConfig();
 
 			// set root category
 			$section_adjustments = Array (
 				'in-portal:browse' => Array (
 					'url' => Array ('m_cat_id' => $root_category),
 					'late_load' => Array ('m_cat_id' => $root_category),
 					'onclick' => 'checkCatalog(' . $root_category . ', "c")',
 				),
 				'in-portal:browse_site' => Array (
 					'url' => Array ('editing_mode' => $settings['default_editing_mode']),
 				)
 			);
 
 			if ( $this->Application->ConfigValue('Catalog_PreselectModuleTab') ) {
 				$section_adjustments['in-portal:browse']['url']['anchor'] = 'tab-c';
 			}
 
 			$config->addSectionAdjustments($section_adjustments);
 
 			// prepare structure dropdown
+			/** @var CategoryHelper $category_helper */
 			$category_helper = $this->Application->recallObject('CategoryHelper');
-			/* @var $category_helper CategoryHelper */
 
 			$fields = $config->getFields();
 
 			$fields['ParentId']['default'] = (int)$this->Application->GetVar('m_cat_id');
 			$fields['ParentId']['options'] = $category_helper->getStructureTreeAsOptions();
 
 			// limit design list by theme
 			$theme_id = $this->_getCurrentThemeId();
 			$design_sql = $fields['Template']['options_sql'];
 			$design_sql = str_replace('(tf.FilePath = "/designs")', '(' . implode(' OR ', $this->getDesignFolders()) . ')' . ' AND (t.ThemeId = ' . $theme_id . ')', $design_sql);
 			$fields['Template']['options_sql'] = $design_sql;
 
 			// adds "Inherit From Parent" option to "Template" field
 			$fields['Template']['options'] = Array (CATEGORY_TEMPLATE_INHERIT => $this->Application->Phrase('la_opt_InheritFromParent'));
 
 			$config->setFields($fields);
 
 			if ($this->Application->isAdmin) {
 				// don't sort by Front-End sorting fields
 				$config_mapping = $config->getConfigMapping();
 				$remove_keys = Array ('DefaultSorting1Field', 'DefaultSorting2Field', 'DefaultSorting1Dir', 'DefaultSorting2Dir');
 
 				foreach ($remove_keys as $remove_key) {
 					unset($config_mapping[$remove_key]);
 				}
 
 				$config->setConfigMapping($config_mapping);
 			}
 			else {
 				// sort by parent path on Front-End only
 				$config->setListSortingsBySpecial('', Array (
 					'ForcedSorting' => Array ('CurrentSort' => 'asc'),
 				));
 			}
 
 			$this->addViewPermissionJoin($event);
 
 			// add grids for advanced view (with primary category column)
 			foreach (Array ('Default', 'Radio') as $process_grid) {
 				$grid_data = $config->getGridByName($process_grid);
 				$grid_data['Fields']['CachedNavbar'] = Array ('title' => 'la_col_Path', 'data_block' => 'grid_parent_category_td', 'filter_block' => 'grid_like_filter');
 				$config->addGrids($grid_data, $process_grid . 'ShowAll');
 			}
 		}
 
 		/**
 		 * Adds permission table table JOIN clause only, when advanced catalog view permissions enabled.
 		 *
 		 * @param kEvent $event Event.
 		 *
 		 * @return self
 		 * @access protected
 		 */
 		protected function addViewPermissionJoin(kEvent $event)
 		{
 			if ( $this->Application->ConfigValue('CheckViewPermissionsInCatalog') ) {
 				$join_clause = 'LEFT JOIN ' . TABLE_PREFIX . 'CategoryPermissionsCache perm ON perm.CategoryId = %1$s.CategoryId';
 			}
 			else {
 				$join_clause = '';
 			}
 
 			$config = $event->getUnitConfig();
 
 			foreach ( $config->getListSQLSpecials() as $special ) {
 				$list_sql = str_replace('{PERM_JOIN}', $join_clause, $config->getListSQLsBySpecial($special));
 				$config->setListSQLsBySpecial($special, $list_sql);
 			}
 
 			return $this;
 		}
 
 		/**
 		 * Returns folders, that can contain design templates
 		 *
 		 * @return array
 		 * @access protected
 		 */
 		protected function getDesignFolders()
 		{
 			$ret = Array ('tf.FilePath = "/designs"', 'tf.FilePath = "/platform/designs"');
 
 			foreach ($this->Application->ModuleInfo as $module_info) {
 				$ret[] = 'tf.FilePath = "/' . $module_info['TemplatePath'] . 'designs"';
 			}
 
 			return array_unique($ret);
 		}
 
 		/**
 		 * Removes this item and it's children (recursive) from structure dropdown
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemLoad(kEvent $event)
 		{
 			parent::OnAfterItemLoad($event);
 
 			if ( !$this->Application->isAdmin ) {
 				// calculate priorities dropdown only for admin
 				return;
 			}
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			// remove this category & it's children from dropdown
 			$sql = 'SELECT ' . $object->IDField . '
 					FROM ' . $event->getUnitConfig()->getTableName() . '
 					WHERE ParentPath LIKE "' . $object->GetDBField('ParentPath') . '%"';
 			$remove_categories = $this->Conn->GetCol($sql);
 
 			$options = $object->GetFieldOption('ParentId', 'options');
 
 			foreach ($remove_categories as $remove_category) {
 				unset($options[$remove_category]);
 			}
 
 			$object->SetFieldOption('ParentId', 'options', $options);
 		}
 
 		/**
 		 * Occurs after creating item
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemCreate(kEvent $event)
 		{
 			parent::OnAfterItemCreate($event);
 
+			/** @var CategoriesItem $object */
 			$object = $event->getObject();
-			/* @var $object CategoriesItem */
 
 			// need to update path after category is created, so category is included in that path
 			$fields_hash = $object->buildParentBasedFields();
 			$this->Conn->doUpdate($fields_hash, $object->TableName, $object->IDField . ' = ' . $object->GetID());
 			$object->SetDBFieldsFromHash($fields_hash);
 		}
 
 		/**
 		 * Enter description here...
 		 *
 		 * @param kEvent $event
 		 */
 		function OnAfterRebuildThemes($event)
 		{
 			$sql = 'SELECT t.ThemeId, CONCAT( tf.FilePath, \'/\', tf.FileName ) AS Path, tf.FileMetaInfo
 					FROM ' . TABLE_PREFIX . 'ThemeFiles AS tf
 					LEFT JOIN ' . TABLE_PREFIX . 'Themes AS t ON t.ThemeId = tf.ThemeId
 					WHERE t.Enabled = 1 AND tf.FileType = 1
 					AND (
 						SELECT COUNT(CategoryId)
 						FROM ' . TABLE_PREFIX . 'Categories c
 						WHERE CONCAT(\'/\', c.Template, \'.tpl\') = CONCAT( tf.FilePath, \'/\', tf.FileName ) AND (c.ThemeId = t.ThemeId)
 					) = 0 ';
 			$files = $this->Conn->Query($sql, 'Path');
 			if ( !$files ) {
 				// all possible pages are already created
 				return;
 			}
 
 			kUtil::setResourceLimit();
 
+			/** @var CategoriesItem $dummy */
 			$dummy = $this->Application->recallObject($event->Prefix . '.rebuild', NULL, Array ('skip_autoload' => true));
-			/* @var $dummy CategoriesItem */
 
 			$error_count = 0;
 			foreach ($files as $a_file => $file_info) {
 				$status = $this->_prepareAutoPage($dummy, $a_file, $file_info['ThemeId'], SMS_MODE_FORCE, unserialize($file_info['FileMetaInfo'])); // create system page
 				if ( !$status ) {
 					$error_count++;
 				}
 			}
 
 			if ( $this->Application->ConfigValue('CategoryPermissionRebuildMode') == CategoryPermissionRebuild::SILENT ) {
+				/** @var kPermCacheUpdater $updater */
 				$updater = $this->Application->makeClass('kPermCacheUpdater');
-				/* @var $updater kPermCacheUpdater */
 
 				$updater->OneStepRun();
 			}
 
 			$this->_resetMenuCache();
 
 			if ( $error_count ) {
 				// allow user to review error after structure page creation
 				$event->MasterEvent->redirect = false;
 			}
 		}
 
 		/**
 		 * Processes OnMassMoveUp, OnMassMoveDown events
 		 *
 		 * @param kEvent $event
 		 */
 		function OnChangePriority($event)
 		{
 			$this->Application->SetVar('priority_prefix', $event->getPrefixSpecial());
 			$event->CallSubEvent('priority:' . $event->Name);
 
 			$this->Application->StoreVar('RefreshStructureTree', 1);
 			$this->_resetMenuCache();
 		}
 
 		/**
 		 * Completely recalculates priorities in current category
 		 *
 		 * @param kEvent $event
 		 */
 		function OnRecalculatePriorities($event)
 		{
 			if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
 				$event->status = kEvent::erFAIL;
 				return;
 			}
 
 			$this->Application->SetVar('priority_prefix', $event->getPrefixSpecial());
 			$event->CallSubEvent('priority:' . $event->Name);
 
 			$this->_resetMenuCache();
 		}
 
 		/**
 		 * Update Preview Block for FCKEditor
 		 *
 		 * @param kEvent $event
 		 */
 		function OnUpdatePreviewBlock($event)
 		{
 			$event->status = kEvent::erSTOP;
 			$string = $this->Application->unescapeRequestVariable($this->Application->GetVar('preview_content'));
 
+			/** @var CategoryHelper $category_helper */
 			$category_helper = $this->Application->recallObject('CategoryHelper');
-			/* @var $category_helper CategoryHelper */
 
 			$string = $category_helper->replacePageIds($string);
 
 			$this->Application->StoreVar('_editor_preview_content_', $string);
 		}
 
 		/**
 		 * Makes simple search for categories
 		 * based on keywords string
 		 *
 		 * @param kEvent $event
 		 */
 		function OnSimpleSearch($event)
 		{
 			$event->redirect = false;
 
 			$keywords = $this->Application->unescapeRequestVariable(trim($this->Application->GetVar('keywords')));
 
+			/** @var kHTTPQuery $query_object */
 			$query_object = $this->Application->recallObject('kHTTPQuery');
-			/* @var $query_object kHTTPQuery */
 
 			/** @var kSearchHelper $search_helper */
 			$search_helper = $this->Application->recallObject('SearchHelper');
 
 			$search_table = $search_helper->getSearchTable();
 			$sql = 'SHOW TABLES LIKE "'.$search_table.'"';
 
 			if ( !isset($query_object->Get['keywords']) && !isset($query_object->Post['keywords']) && $this->Conn->Query($sql) ) {
 				// used when navigating by pages or changing sorting in search results
 				return;
 			}
 
 			if(!$keywords || strlen($keywords) < $this->Application->ConfigValue('Search_MinKeyword_Length'))
 			{
 				$search_helper->ensureEmptySearchTable();
 				$this->Application->SetVar('keywords_too_short', 1);
 				return; // if no or too short keyword entered, doing nothing
 			}
 
 			$this->Application->StoreVar('keywords', $keywords);
 
 			$this->saveToSearchLog($keywords, 0); // 0 - simple search, 1 - advanced search
 
 			$keywords = strtr($keywords, Array('%' => '\\%', '_' => '\\_'));
 
 			$event->setPseudoClass('_List');
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			$config = $event->getUnitConfig();
 
 			$this->Application->SetVar($event->getPrefixSpecial().'_Page', 1);
 			$lang = $this->Application->GetVar('m_lang');
 			$items_table = $config->getTableName();
 			$module_name = 'In-Portal';
 
 			$sql = 'SELECT *
 					FROM ' . $this->Application->getUnitConfig('confs')->getTableName() . '
 					WHERE ModuleName = ' . $this->Conn->qstr($module_name) . ' AND SimpleSearch = 1';
 			$search_config = $this->Conn->Query($sql, 'FieldName');
 
 			$field_list = array_keys($search_config);
 
 			$join_clauses = Array();
 
 			// field processing
 			$weight_sum = 0;
 
 			$alias_counter = 0;
 
 			$custom_fields = $config->getCustomFields();
 			if ($custom_fields) {
 				$custom_table = $this->Application->getUnitConfig($event->Prefix . '-cdata')->getTableName();
 				$join_clauses[] = '	LEFT JOIN '.$custom_table.' custom_data ON '.$items_table.'.ResourceId = custom_data.ResourceId';
 			}
 
 			// what field in search config becomes what field in sql (key - new field, value - old field (from searchconfig table))
 			$search_config_map = Array();
 
 			foreach ($field_list as $key => $field) {
 				$local_table = TABLE_PREFIX.$search_config[$field]['TableName'];
 				$weight_sum += $search_config[$field]['Priority']; // counting weight sum; used when making relevance clause
 
 				// processing multilingual fields
 				if ( !$search_config[$field]['CustomFieldId'] && $object->GetFieldOption($field, 'formatter') == 'kMultiLanguage' ) {
 					$field_list[$key.'_primary'] = 'l'.$this->Application->GetDefaultLanguageId().'_'.$field;
 					$field_list[$key] = 'l'.$lang.'_'.$field;
 
 					if (!isset($search_config[$field]['ForeignField'])) {
 						$field_list[$key.'_primary'] = $local_table.'.'.$field_list[$key.'_primary'];
 						$search_config_map[ $field_list[$key.'_primary'] ] = $field;
 					}
 				}
 
 				// processing fields from other tables
 				$foreign_field = $search_config[$field]['ForeignField'];
 
 				if ( $foreign_field ) {
 					$exploded = explode(':', $foreign_field, 2);
 					if ($exploded[0] == 'CALC') {
 						// ignoring having type clauses in simple search
 						unset($field_list[$key]);
 						continue;
 					}
 					else {
 						$multi_lingual = false;
 						if ($exploded[0] == 'MULTI') {
 							$multi_lingual = true;
 							$foreign_field = $exploded[1];
 						}
 
 						$exploded = explode('.', $foreign_field);	// format: table.field_name
 						$foreign_table = TABLE_PREFIX.$exploded[0];
 
 						$alias_counter++;
 						$alias = 't'.$alias_counter;
 
 						if ($multi_lingual) {
 							$field_list[$key] = $alias.'.'.'l'.$lang.'_'.$exploded[1];
 							$field_list[$key.'_primary'] = 'l'.$this->Application->GetDefaultLanguageId().'_'.$field;
 							$search_config_map[ $field_list[$key] ] = $field;
 							$search_config_map[ $field_list[$key.'_primary'] ] = $field;
 						}
 						else {
 							$field_list[$key] = $alias.'.'.$exploded[1];
 							$search_config_map[ $field_list[$key] ] = $field;
 						}
 
 						$join_clause = str_replace('{ForeignTable}', $alias, $search_config[$field]['JoinClause']);
 						$join_clause = str_replace('{LocalTable}', $items_table, $join_clause);
 
 						$join_clauses[] = '	LEFT JOIN '.$foreign_table.' '.$alias.'
 											ON '.$join_clause;
 					}
 				}
 				else {
 					// processing fields from local table
 					if ($search_config[$field]['CustomFieldId']) {
 						$local_table = 'custom_data';
 
 						// search by custom field value on current language
 						$custom_field_id = array_search($field_list[$key], $custom_fields);
 						$field_list[$key] = 'l'.$lang.'_cust_'.$custom_field_id;
 
 						// search by custom field value on primary language
 						$field_list[$key.'_primary'] = $local_table.'.l'.$this->Application->GetDefaultLanguageId().'_cust_'.$custom_field_id;
 						$search_config_map[ $field_list[$key.'_primary'] ] = $field;
 					}
 
 					$field_list[$key] = $local_table.'.'.$field_list[$key];
 					$search_config_map[ $field_list[$key] ] = $field;
 				}
 			}
 
 			// Keyword string processing.
 			$where_clause = Array ();
 			foreach ($field_list as $field) {
 				if (preg_match('/^' . preg_quote($items_table, '/') . '\.(.*)/', $field, $regs)) {
 					// local real field
 					$filter_data = $search_helper->getSearchClause($object, $regs[1], $keywords, false);
 					if ($filter_data) {
 						$where_clause[] = $filter_data['value'];
 					}
 				}
 				elseif (preg_match('/^custom_data\.(.*)/', $field, $regs)) {
 					$custom_field_name = 'cust_' . $search_config_map[$field];
 					$filter_data = $search_helper->getSearchClause($object, $custom_field_name, $keywords, false);
 					if ($filter_data) {
 						$where_clause[] = str_replace('`' . $custom_field_name . '`', $field, $filter_data['value']);
 					}
 				}
 				else {
 					$where_clause[] = $search_helper->buildWhereClause($keywords, Array ($field));
 				}
 			}
 
 			$where_clause = '((' . implode(') OR (', $where_clause) . '))'; // 2 braces for next clauses, see below!
 
 			$where_clause = $where_clause . ' AND (' . $items_table . '.Status = ' . STATUS_ACTIVE . ')';
 
 			if ($event->MasterEvent && $event->MasterEvent->Name == 'OnListBuild') {
 				$sub_search_ids = $event->MasterEvent->getEventParam('ResultIds');
 
 				if ( $sub_search_ids !== false ) {
 					if ( $sub_search_ids ) {
 						$where_clause .= 'AND (' . $items_table . '.ResourceId IN (' . implode(',', $sub_search_ids) . '))';
 					}
 					else {
 						$where_clause .= 'AND FALSE';
 					}
 				}
 			}
 
 			// exclude template based sections from search results (ie. registration)
 			if ( $this->Application->ConfigValue('ExcludeTemplateSectionsFromSearch') ) {
 				$where_clause .= ' AND ' . $items_table . '.ThemeId = 0';
 			}
 
 			// making relevance clause
 			$positive_words = $search_helper->getPositiveKeywords($keywords);
 			$this->Application->StoreVar('highlight_keywords', serialize($positive_words));
 			$revelance_parts = Array();
 			reset($search_config);
 
 			foreach ($positive_words as $keyword_index => $positive_word) {
 				$positive_word = $search_helper->transformWildcards($positive_word);
 				$positive_words[$keyword_index] = $this->Conn->escape($positive_word);
 			}
 
 			foreach ($field_list as $field) {
 
 				if (!array_key_exists($field, $search_config_map)) {
 					$map_key = $search_config_map[$items_table . '.' . $field];
 				}
 				else {
 					$map_key = $search_config_map[$field];
 				}
 
 				$config_elem = $search_config[ $map_key ];
 				$weight = $config_elem['Priority'];
 
 				// search by whole words only ([[:<:]] - word boundary)
 				/*$revelance_parts[] = 'IF('.$field.' REGEXP "[[:<:]]('.implode(' ', $positive_words).')[[:>:]]", '.$weight.', 0)';
 				foreach ($positive_words as $keyword) {
 					$revelance_parts[] = 'IF('.$field.' REGEXP "[[:<:]]('.$keyword.')[[:>:]]", '.$weight.', 0)';
 				}*/
 
 				if ( count($positive_words) > 1 ) {
 					$condition = $field . ' LIKE "%' . implode(' ', $positive_words) . '%"';
 					$revelance_parts[] = 'IF(' . $condition . ', ' . $weight_sum . ', 0)';
 				}
 
 				// search by partial word matches too
 				foreach ( $positive_words as $keyword ) {
 					$revelance_parts[] = 'IF(' . $field . ' LIKE "%' . $keyword . '%", ' . $weight . ', 0)';
 				}
 			}
 
 			$revelance_parts = array_unique($revelance_parts);
 
 			$conf_postfix = $config->getSearchConfigPostfix();
 			$rel_keywords	= $this->Application->ConfigValue('SearchRel_Keyword_'.$conf_postfix)	/ 100;
 			$rel_pop		= $this->Application->ConfigValue('SearchRel_Pop_'.$conf_postfix)		/ 100;
 			$rel_rating		= $this->Application->ConfigValue('SearchRel_Rating_'.$conf_postfix)	/ 100;
 			$relevance_clause = '('.implode(' + ', $revelance_parts).') / '.$weight_sum.' * '.$rel_keywords;
 			if ($rel_pop && $object->isField('Hits')) {
 				$relevance_clause .= ' + (Hits + 1) / (MAX(Hits) + 1) * '.$rel_pop;
 			}
 			if ($rel_rating && $object->isField('CachedRating')) {
 				$relevance_clause .= ' + (CachedRating + 1) / (MAX(CachedRating) + 1) * '.$rel_rating;
 			}
 
 			// building final search query
 			if (!$this->Application->GetVar('do_not_drop_search_table')) {
 				$this->Conn->Query('DROP TABLE IF EXISTS '.$search_table); // erase old search table if clean k4 event
 				$this->Application->SetVar('do_not_drop_search_table', true);
 			}
 
 			$search_table_exists = $this->Conn->Query('SHOW TABLES LIKE "'.$search_table.'"');
 			if ($search_table_exists) {
 				$select_intro = 'INSERT INTO '.$search_table.' (Relevance, ItemId, ResourceId, ItemType, EdPick) ';
 			}
 			else {
 				$select_intro = 'CREATE TABLE '.$search_table.' AS ';
 			}
 
 			$edpick_clause = $config->getFieldByName('EditorsPick') ? $items_table.'.EditorsPick' : '0';
 
 			$sql = $select_intro.' SELECT '.$relevance_clause.' AS Relevance,
 								'.$items_table.'.'.$config->getIDField().' AS ItemId,
 								'.$items_table.'.ResourceId,
 								'.$config->getItemType().' AS ItemType,
 								 '.$edpick_clause.' AS EdPick
 						FROM '.$object->TableName.'
 						'.implode(' ', $join_clauses).'
 						WHERE '.$where_clause.'
 						GROUP BY '.$items_table.'.'.$config->getIDField().' ORDER BY Relevance DESC';
 
 			$this->Conn->Query($sql);
 
 			if ( !$search_table_exists ) {
 				$sql = 'ALTER TABLE ' . $search_table . '
 						ADD INDEX (ResourceId),
 						ADD INDEX (Relevance)';
 				$this->Conn->Query($sql);
 			}
 		}
 
 		/**
 		 * Enter description here...
 		 *
 		 * @param kEvent $event
 		 */
 		function OnSubSearch($event)
 		{
 			// keep search results from other items after doing a sub-search on current item type
 			$this->Application->SetVar('do_not_drop_search_table', true);
 
 			/** @var kSearchHelper $search_helper */
 			$search_helper = $this->Application->recallObject('SearchHelper');
 
 			$search_table = $search_helper->getSearchTable();
 			$sql = 'SHOW TABLES LIKE "' . $search_table . '"';
 			$ids = array();
 
 			if ( $this->Conn->Query($sql) ) {
 				$item_type = $event->getUnitConfig()->getItemType();
 
 				// 1. get ids to be used as search bounds
 				$sql = 'SELECT DISTINCT ResourceId
 						FROM ' . $search_table . '
 						WHERE ItemType = ' . $item_type;
 				$ids = $this->Conn->GetCol($sql);
 
 				// 2. delete previously found ids
 				$sql = 'DELETE FROM ' . $search_table . '
 						WHERE ItemType = ' . $item_type;
 				$this->Conn->Query($sql);
 			}
 
 			$event->setEventParam('ResultIds', $ids);
 			$event->CallSubEvent('OnSimpleSearch');
 		}
 
 		/**
 		 * Make record to search log
 		 *
 		 * @param string $keywords
 		 * @param int $search_type 0 - simple search, 1 - advanced search
 		 */
 		function saveToSearchLog($keywords, $search_type = 0)
 		{
 			// don't save keywords for each module separately, just one time
 			// static variable can't help here, because each module uses it's own class instance !
 			if (!$this->Application->GetVar('search_logged')) {
 				$sql = 'UPDATE '.TABLE_PREFIX.'SearchLogs
 						SET Indices = Indices + 1
 						WHERE Keyword = '.$this->Conn->qstr($keywords).' AND SearchType = '.$search_type; // 0 - simple search, 1 - advanced search
 		        $this->Conn->Query($sql);
 		        if ($this->Conn->getAffectedRows() == 0) {
 		            $fields_hash = Array('Keyword' => $keywords, 'Indices' => 1, 'SearchType' => $search_type);
 		        	$this->Conn->doInsert($fields_hash, TABLE_PREFIX.'SearchLogs');
 		        }
 
 		        $this->Application->SetVar('search_logged', 1);
 			}
 		}
 
 		/**
 		 * Load item if id is available
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function LoadItem(kEvent $event)
 		{
 			if ( !$this->_isVirtual($event) ) {
 				parent::LoadItem($event);
 				return;
 			}
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$id = $this->getPassedID($event);
 
 			if ( $object->isLoaded() && !is_array($id) && ($object->GetID() == $id) ) {
 				// object is already loaded by same id
 				return;
 			}
 
 			if ( $object->Load($id, null, true) ) {
+				/** @var Params $actions */
 				$actions = $this->Application->recallObject('kActions');
-				/* @var $actions Params */
 
 				$actions->Set($event->getPrefixSpecial() . '_id', $object->GetID());
 			}
 			else {
 				$object->setID($id);
 			}
 		}
 
 		/**
 		 * Returns constrain for priority calculations
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @see PriorityEventHandler
 		 * @access protected
 		 */
 		protected function OnGetConstrainInfo(kEvent $event)
 		{
 			$constrain = ''; // for OnSave
 
 			$event_name = $event->getEventParam('original_event');
 			$actual_event_name = $event->getEventParam('actual_event');
 
 			if ( $actual_event_name == 'OnSavePriorityChanges' || $event_name == 'OnAfterItemLoad' || $event_name == 'OnAfterItemDelete' ) {
+				/** @var kDBItem $object */
 				$object = $event->getObject();
-				/* @var $object kDBItem */
 
 				$constrain = 'ParentId = ' . $object->GetDBField('ParentId');
 			}
 			elseif ( $actual_event_name == 'OnPreparePriorities' ) {
 				$constrain = 'ParentId = ' . $this->Application->GetVar('m_cat_id');
 			}
 			elseif ( $event_name == 'OnSave' ) {
 				$constrain = '';
 			}
 			else {
 				$constrain = 'ParentId = ' . $this->Application->GetVar('m_cat_id');
 			}
 
 			$event->setEventParam('constrain_info', Array ($constrain, ''));
 		}
 
 		/**
 		 * Set's new unique resource id to user
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemValidate(kEvent $event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$resource_id = $object->GetDBField('ResourceId');
 
 			if ( !$resource_id ) {
 				$object->SetDBField('ResourceId', $this->Application->NextResourceId());
 			}
 		}
 
 		/**
 		 * Occurs before an item has been cloned
 		 * Id of newly created item is passed as event' 'id' param
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeClone(kEvent $event)
 		{
 			parent::OnBeforeClone($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$object->SetDBField('ResourceId', 0); // this will reset it
 
 		}
 	}
Index: branches/5.3.x/core/units/categories/categories_item.php
===================================================================
--- branches/5.3.x/core/units/categories/categories_item.php	(revision 16518)
+++ branches/5.3.x/core/units/categories/categories_item.php	(revision 16519)
@@ -1,289 +1,289 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class CategoriesItem extends kDBItem
 	{
 		/**
 		 * Builds parent path for this category
 		 *
 		 * @return Array
 		 * @access public
 		 */
 		public function buildParentBasedFields()
 		{
 			static $parent_cache = Array (
 				0 => Array ('ParentPath' => '|', 'NamedParentPath' => '', 'CachedTemplate' => ''),
 			);
 
+			/** @var kMultiLanguageHelper $ml_helper */
 			$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
-			/* @var $ml_helper kMultiLanguageHelper */
 
 			$languages = $ml_helper->getLanguages();
 			$parent_id = $this->GetDBField('ParentId');
 
 			if ( !isset($parent_cache[$parent_id]) ) {
 				$select_fields = Array ('ParentPath', 'NamedParentPath', 'Template', 'CachedTemplate');
 
 				foreach ($languages as $language_id) {
 					$select_fields[] = 'l' . $language_id . '_Name';
 					$select_fields[] = 'l' . $language_id . '_CachedNavbar';
 				}
 
 				$sql = 'SELECT ' . implode(', ', $select_fields) . '
 						FROM ' . $this->getUnitConfig()->getTableName() . '
 						WHERE CategoryId = ' . $parent_id;
 				$parent_cache[$parent_id] = $this->Conn->GetRow($sql);
 			}
 
 			$named_parent_path = trim($parent_cache[$parent_id]['NamedParentPath'] . '/' . $this->GetDBField('Filename'), '/');
 			$cached_template = $this->GetDBField('Template') == CATEGORY_TEMPLATE_INHERIT ? $parent_cache[$parent_id]['CachedTemplate'] : $this->GetDBField('Template');
 
 			// maybe also build CachedNavbar field here
 			$ret = Array (
 				'ParentPath' => $parent_cache[$parent_id]['ParentPath'] . $this->GetID() . '|',
 				'NamedParentPath' => $named_parent_path,
 				'NamedParentPathHash' => kUtil::crc32(mb_strtolower(preg_replace('/^Content\//i', '', $named_parent_path))),
 				'CachedTemplate' => $cached_template,
 				'CachedTemplateHash' => kUtil::crc32(mb_strtolower($cached_template)),
 			);
 
 			$primary_language = $this->Application->GetDefaultLanguageId();
 
 			foreach ($languages as $language_id) {
 				$language_prefix = 'l' . $language_id . '_';
 				$cached_navbar = $parent_cache[$parent_id][$language_prefix . 'CachedNavbar'] . '&|&';
 				$cached_navbar .= $this->GetDBField($language_prefix . 'Name') ? $this->GetDBField($language_prefix . 'Name') : $this->GetDBField('l' . $primary_language . '_Name');
 
 				$ret['l' . $language_id . '_CachedNavbar'] = $cached_navbar;
 			}
 
 			return $ret;
 		}
 
 		/**
 		 * replace not allowed symbols with "_" chars + remove duplicate "_" chars in result
 		 *
 		 * @param string $string
 		 * @return string
 		 * @access protected
 		 */
 		protected function stripDisallowed($string)
 		{
+			/** @var kFilenamesHelper $filenames_helper */
 			$filenames_helper = $this->Application->recallObject('FilenamesHelper');
-			/* @var $filenames_helper kFilenamesHelper */
 
 			$string = $filenames_helper->replaceSequences($string);
 
 			return $this->checkAutoFilename($string);
 		}
 
 		public function checkFilename()
 		{
 			if ( $this->GetDBField('AutomaticFilename') ) {
 				// filename will be generated from scratch, don't check anything here
 				return;
 			}
 			elseif ( $this->GetDBField('Type') == PAGE_TYPE_TEMPLATE ) {
 				// system page with AutomaticFilename checkbox unchecked -> compatibility with Proj-CMS <= 4.3.9 (when "/" were allowed in Filename)
 				return;
 			}
 
 			$filename = $this->GetDBField('Filename');
 			$this->SetDBField('Filename', $this->stripDisallowed($filename));
 		}
 
 		protected function checkAutoFilename($filename)
 		{
 			static $current_theme = null;
 
 			if (!$filename) {
 				return $filename;
 			}
 
 			if (!isset($current_theme)) {
+				/** @var kThemesHelper $themes_helper */
 				$themes_helper = $this->Application->recallObject('ThemesHelper');
-				/* @var $themes_helper kThemesHelper */
 
 				$current_theme = (int)$themes_helper->getCurrentThemeId();
 			}
 
 			$escape_char = $this->Application->ConfigValue('FilenameSpecialCharReplacement');
 
 			$item_id = !$this->GetID() ? 0 : $this->GetID();
 			$item_theme = $this->GetDBField('ThemeId');
 
 			if (!$item_theme) {
 				// user creates category manually, that's why ThemeId = 0 -> use current admin theme instead
 				$item_theme = $current_theme;
 			}
 
 			$unique_clause = '(Filename = %s) AND (ThemeId = ' . $item_theme . ' OR ThemeId = 0) AND (ParentId = ' . $this->GetDBField('ParentId') . ')';
 
 			$sql_mask = '	SELECT ' . $this->IDField . '
 							FROM %s
 							WHERE ' . sprintf($unique_clause, $this->Conn->qstr($filename));
 
 			// check temp table
 			$sql_temp = sprintf($sql_mask, $this->TableName);
 			$found_temp_ids = $this->Conn->GetCol($sql_temp);
 
 			// check live table
 			$sql_live = sprintf($sql_mask, $this->Application->GetLiveName($this->TableName));
 			$found_live_ids = $this->Conn->GetCol($sql_live);
 
 			$found_item_ids = array_unique( array_merge($found_temp_ids, $found_live_ids) );
 
 			$has_page = preg_match('/(.*)_([\d]+)([a-z]*)$/', $filename, $rets);
 			$duplicates_found = (count($found_item_ids) > 1) || ($found_item_ids && $found_item_ids[0] != $item_id);
 
 			if ($duplicates_found || $has_page) {// other category has same filename as ours OR we have filename, that ends with _number
 				$append = $duplicates_found ? $escape_char . 'a' : '';
 				if ($has_page) {
 					$filename = $rets[1].'_'.$rets[2];
 					$append = $rets[3] ? $rets[3] : $escape_char . 'a';
 				}
 
 				// check live & temp table
 				$sql_temp = '	SELECT ' . $this->IDField . '
 								FROM ' . $this->TableName . '
 								WHERE ' . $unique_clause . ' AND (' . $this->IDField . ' != ' . $item_id . ')';
 
 				$sql_live = '	SELECT ' . $this->IDField . '
 								FROM ' . $this->Application->GetLiveName($this->TableName) . '
 								WHERE ' . $unique_clause . ' AND (' . $this->IDField . ' != ' . $item_id . ')';
 
 				while ( $this->Conn->GetOne( sprintf($sql_temp, $this->Conn->qstr($filename.$append)) ) > 0 ||
 				$this->Conn->GetOne( sprintf($sql_live, $this->Conn->qstr($filename.$append)) ) > 0 )
 				{
 					if (mb_substr($append, -1) == 'z') $append .= 'a';
 					$append = mb_substr($append, 0, mb_strlen($append) - 1) . chr( ord( mb_substr($append, -1) ) + 1 );
 				}
 
 				return $filename . $append;
 			}
 
 			return $filename;
 		}
 
 		/**
 		 * Generate item's filename based on it's title field value
 		 *
 		 * @return void
 		 * @access public
 		 */
 		public function generateFilename()
 		{
 			if ( !$this->GetDBField('AutomaticFilename') && $this->GetDBField('Filename') ) {
 				return ;
 			}
 
+			/** @var kMultiLanguage $ml_formatter */
 			$ml_formatter = $this->Application->recallObject('kMultiLanguage');
-			/* @var $ml_formatter kMultiLanguage */
 
 			$name = $this->stripDisallowed( $this->GetDBField($ml_formatter->LangFieldName('Name', true)) );
 
 			if ( $name != $this->GetDBField('Filename') ) {
 				$this->SetDBField('Filename', $name);
 			}
 		}
 
 		/**
 		 * Allows to detect if root category being edited
 		 *
 		 * @return int
 		 * @access public
 		 */
 		public function IsRoot()
 		{
 			return $this->Application->RecallVar('IsRootCategory_'.$this->Application->GetVar('m_wid'));
 		}
 
 
 		/**
 		 * Sets correct name to Home category while editing it
 		 *
 		 * @return bool
 		 * @access public
 		 */
 		public function IsNewItem()
 		{
 			if ( $this->IsRoot() && $this->Prefix == 'c' ) {
 				$title_field = $this->getUnitConfig()->getTitleField();
 				$category_name = $this->Application->Phrase(($this->Application->isAdmin ? 'la_' : 'lu_') . 'rootcategory_name');
 				$this->SetDBField($title_field, $category_name);
 
 				return false;
 			}
 
 			return parent::IsNewItem();
 		}
 
 		/**
 		 * Sets new name for item in case if it is being copied in same table
 		 *
 		 * @param array $master Table data from TempHandler
 		 * @param int $foreign_key ForeignKey value to filter name check query by
 		 * @param string $title_field FieldName to alter, by default - TitleField of the prefix
 		 * @param string $format sprintf-style format of renaming pattern, by default Copy %1$s of %2$s which makes it Copy [Number] of Original Name
 		 * @access public
 		 */
 		public function NameCopy($master=null, $foreign_key=null, $title_field=null, $format='Copy %1$s of %2$s')
 		{
 			if (!isset($title_field)) {
 				$title_field = $this->getUnitConfig()->getTitleField();
 				if (!$title_field || isset($this->CalculatedFields[$title_field]) ) return;
 			}
 
 			$new_name = $this->GetDBField($title_field);
 			$cat_id = $this->Application->GetVar('m_cat_id');
 			$this->SetDBField('ParentId', $cat_id);
 			$original_checked = false;
 			do {
 				if ( preg_match('/Copy ([0-9]*) *of (.*)/', $new_name, $regs) ) {
 					$new_name = 'Copy '.($regs[1]+1).' of '.$regs[2];
 				}
 				elseif ($original_checked) {
 					$new_name = 'Copy of '.$new_name;
 				}
 
 				// if we are cloning in temp table this will look for names in temp table,
 				// since object' TableName contains correct TableName (for temp also!)
 				// if we are cloning live - look in live
 				$query = '	SELECT ' . $title_field . '
 							FROM ' . $this->TableName . '
 							WHERE ParentId = ' . (int)$cat_id . ' AND ' . $title_field . ' = ' . $this->Conn->qstr($new_name);
 
 				$foreign_key_field = getArrayValue($master, 'ForeignKey');
 				$foreign_key_field = is_array($foreign_key_field) ? $foreign_key_field[ $master['ParentPrefix'] ] : $foreign_key_field;
 
 				if ($foreign_key_field && isset($foreign_key)) {
 					$query .= ' AND '.$foreign_key_field.' = '.$foreign_key;
 				}
 
 				$res = $this->Conn->GetOne($query);
 
 				/*// if not found in live table, check in temp table if applicable
 				if ($res === false && $object->Special == 'temp') {
 					$query = 'SELECT '.$name_field.' FROM '.$this->GetTempName($master['TableName']).'
 										WHERE '.$name_field.' = '.$this->Conn->qstr($new_name);
 					$res = $this->Conn->GetOne($query);
 				}*/
 
 				$original_checked = true;
 			} while ($res !== false);
 			$this->SetDBField($title_field, $new_name);
 		}
 	}
\ No newline at end of file
Index: branches/5.3.x/core/units/categories/cache_updater.php
===================================================================
--- branches/5.3.x/core/units/categories/cache_updater.php	(revision 16518)
+++ branches/5.3.x/core/units/categories/cache_updater.php	(revision 16519)
@@ -1,553 +1,553 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class clsRecursionStack {
 
 		var $Stack;
 
 		/**
 		 * Creates instance of clsRecursionStack class.
 		 */
 		public function __construct()
 		{
 			$this->Stack = Array();
 		}
 
 		function Push($values)
 		{
 			array_push($this->Stack, $values);
 		}
 
 		function Pop()
 		{
 			if ($this->Count() > 0) {
 				return array_pop($this->Stack);
 			}
 			else {
 				return false;
 			}
 		}
 
 		function Get()
 		{
 			if ($this->Count() > 0) {
 	//			return end($this->Stack);
 				return $this->Stack[count($this->Stack)-1];
 			}
 			else {
 				return false;
 			}
 		}
 
 		function Update($values)
 		{
 			$this->Stack[count($this->Stack)-1] = $values;
 		}
 
 		function Count()
 		{
 			return count($this->Stack);
 		}
 	}
 
 	class clsCachedPermissions {
 
 		var $Allow = Array();
 		var $Deny = Array();
 		var $CatId;
 
 		/**
 		 * Table name used for inserting permissions
 		 *
 		 * @var string
 		 */
 		var $table = '';
 
 		/**
 		 * Creates class instance.
 		 *
 		 * @param integer $cat_id     Category ID.
 		 * @param string  $table_name Table name.
 		 */
 		public function __construct($cat_id, $table_name)
 		{
 			$this->CatId = $cat_id;
 			$this->table = $table_name;
 		}
 
 		function SetCatId($CatId)
 		{
 			$this->CatId = $CatId;
 		}
 
 		function CheckPermArray($Perm)
 		{
 			if (!isset($this->Allow[$Perm])) {
 				$this->Allow[$Perm] = array();
 				$this->Deny[$Perm] = array();
 			}
 		}
 
 		function AddAllow($Perm, $GroupId)
 		{
 			$this->CheckPermArray($Perm);
 			if (!in_array($GroupId, $this->Allow[$Perm])) {
 				array_push($this->Allow[$Perm], $GroupId);
 				$this->RemoveDeny($Perm, $GroupId);
 			}
 		}
 
 		function AddDeny($Perm, $GroupId)
 		{
 			$this->CheckPermArray($Perm);
 			if (!in_array($GroupId, $this->Deny[$Perm])) {
 				array_push($this->Deny[$Perm], $GroupId);
 				$this->RemoveAllow($Perm, $GroupId);
 			}
 		}
 
 		function RemoveDeny($Perm, $GroupId)
 		{
 			if (in_array($GroupId, $this->Deny[$Perm])) {
 				array_splice($this->Deny[$Perm], array_search($GroupId, $this->Deny[$Perm]), 1);
 			}
 		}
 
 		function RemoveAllow($Perm, $GroupId)
 		{
 			if (in_array($GroupId, $this->Allow[$Perm])) {
 				array_splice($this->Allow[$Perm], array_search($GroupId, $this->Allow[$Perm]), 1);
 			}
 		}
 
 		function GetInsertSQL()
 		{
 			$values = array();
 			foreach ($this->Allow as $perm => $groups) {
 				if (count($groups) > 0) {
 					$values[] = '(' .$this->CatId. ', ' .$perm. ', "' .join(',', $groups). '")';
 				}
 			}
 			if (!$values) return '';
 			$sql = 'INSERT INTO '.$this->table.' (CategoryId, PermId, ACL) VALUES '.join(',', $values);
 			return $sql;
 		}
 	}
 
 	class kPermCacheUpdater extends kHelper {
 		/**
 		 * Holds Stack
 		 *
 		 * @var clsRecursionStack
 		 */
 		var $Stack;
 
 		/**
 		 * Rebuild process iteration
 		 *
 		 * @var int
 		 */
 		var $iteration;
 
 		/**
 		 * Categories count to process
 		 *
 		 * @var unknown_type
 		 */
 		var $totalCats = 0;
 
 		/**
 		 * Processed categories count
 		 *
 		 * @var int
 		 */
 		var $doneCats = 0;
 
 		/**
 		 * Temporary table name used for storing cache building progress
 		 *
 		 * @var string
 		 */
 		var $progressTable = '';
 
 		/**
 		 * Temporary table name used for storing not fully built permissions cache
 		 * 1. preserves previous cache while new cache is building
 		 * 2. when rebuild process fails allows previous cache (in live table) is used
 		 *
 		 * @var string
 		 */
 		var $permCacheTable = '';
 
 		var $primaryLanguageId = 0;
 
 		var $languages = Array ();
 
 		var $root_prefixes = Array();
 
 		/**
 		 * Update cache only for requested categories and it's parent categories
 		 *
 		 * @var bool
 		 */
 		var $StrictPath = false;
 
 		/**
 		 * Returns instance of perm cache updater
 		 *
 		 * @param int $continuing
 		 * @param mixed $strict_path
 		 */
 		public function __construct($continuing = null, $strict_path = null)
 		{
 			parent::__construct();
 
 			if ( isset($strict_path) ) {
 				if ( $strict_path && !is_array($strict_path) ) {
 					$strict_path = explode('|', trim($strict_path, '|'));
 				}
 
 				$this->StrictPath = $strict_path;
 			}
 
 			// cache widely used values to speed up process
+			/** @var kMultiLanguageHelper $ml_helper */
 			$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
-			/* @var $ml_helper kMultiLanguageHelper */
 
 			$this->languages = $ml_helper->getLanguages();
 			$this->primaryLanguageId = $this->Application->GetDefaultLanguageId();
 
 			foreach ($this->Application->ModuleInfo as $module_name => $module_info) {
 				$this->root_prefixes[ $module_info['RootCat'] ] = $module_info['Var'];
 			}
 
 			$this->iteration = 0;
 			$this->progressTable = $this->Application->GetTempName('permCacheUpdate');
 			$this->permCacheTable = $this->Application->GetTempName(TABLE_PREFIX.'CategoryPermissionsCache');
 
 			if (!isset($continuing) || $continuing == 1) {
 				$this->InitUpdater();
 			}
 			elseif ($continuing == 2) {
 				$this->getData();
 			}
 		}
 
 		function InitUpdater()
 		{
 			$this->Stack = new clsRecursionStack();
 			$this->initData();
 		}
 
 		function getDonePercent()
 		{
 			if (!$this->totalCats) {
 				return 0;
 			}
 			return min(100, intval( floor( $this->doneCats / $this->totalCats * 100 ) ));
 		}
 
 		function getData()
 		{
 			$tmp = $this->Conn->GetOne('SELECT data FROM '.$this->progressTable);
 			if ($tmp) $tmp = unserialize($tmp);
 
 			$this->totalCats = isset($tmp['totalCats']) ? $tmp['totalCats'] : 0;
 			$this->doneCats = isset($tmp['doneCats']) ? $tmp['doneCats'] : 0;
 			if (isset($tmp['stack'])) {
 				$this->Stack = $tmp['stack'];
 			}
 			else {
 				$this->Stack = new clsRecursionStack();
 			}
 		}
 
 		function setData()
 		{
 			$tmp = Array (
 				'totalCats'	=>	$this->totalCats,
 				'doneCats'	=>	$this->doneCats,
 				'stack'		=>	$this->Stack,
 			);
 
 			$this->Conn->Query('DELETE FROM '.$this->progressTable);
 
 			$fields_hash = Array('data' => serialize($tmp));
 			$this->Conn->doInsert($fields_hash, $this->progressTable);
 		}
 
 		function initData()
 		{
 			$this->clearData(); // drop table before starting anyway
 
 			// 1. create table for rebuilding permissions cache
 			$this->Conn->Query('CREATE TABLE '.$this->permCacheTable.' LIKE '.TABLE_PREFIX.'CategoryPermissionsCache');
 
 			if ($this->StrictPath) {
 				// when using strict path leave all other cache intact
 				$sql = 'INSERT INTO '.$this->permCacheTable.'
 						SELECT *
 						FROM '.TABLE_PREFIX.'CategoryPermissionsCache';
 				$this->Conn->Query($sql);
 
 				// delete only cache related to categories in path
 				$sql = 'DELETE FROM '.$this->permCacheTable.'
 						WHERE CategoryId IN ('.implode(',', $this->StrictPath).')';
 				$this->Conn->Query($sql);
 			}
 
 			$add_charset = defined(SQL_CHARSET)? ' CHARACTER SET '.SQL_CHARSET.' ' : '';
 			$add_collation = defined(SQL_COLLATION)? ' COLLATE '.SQL_COLLATION.' ' : '';
 
 			$this->Conn->Query('CREATE TABLE '.$this->progressTable.'(data LONGTEXT'.$add_charset.$add_collation.') '.$add_charset.$add_collation);
 
 			$this->totalCats = (int)$this->Conn->GetOne('SELECT COUNT(*) FROM '.TABLE_PREFIX.'Categories');
 			$this->doneCats = 0;
 		}
 
 		function clearData()
 		{
 			// some templates use this
 			$sql = 'UPDATE ' . TABLE_PREFIX . 'SystemSettings
 					SET VariableValue = VariableValue + 1
 					WHERE VariableName = "CategoriesRebuildSerial"';
 			$this->Conn->Query($sql);
 
 			// always drop temporary tables
 			$this->Conn->Query('DROP TABLE IF EXISTS '.$this->progressTable);
 			$this->Conn->Query('DROP TABLE IF EXISTS '.$this->permCacheTable);
 			$this->Application->deleteDBCache('ForcePermCacheUpdate');
 		}
 
 		function SaveData()
 		{
 			// copy data from temp permission cache table back to live
 			$this->Conn->Query('TRUNCATE '.TABLE_PREFIX.'CategoryPermissionsCache');
 
 			$sql = 'INSERT INTO '.TABLE_PREFIX.'CategoryPermissionsCache
 					SELECT *
 					FROM '.$this->permCacheTable;
 			$this->Conn->Query($sql);
 			$this->clearData();
 
 			$this->Application->incrementCacheSerial('c');
 		}
 
 		function DoTheJob()
 		{
 			$data = $this->Stack->Get();
 			if ($data === false) { //If Stack is empty
 				$data['current_id']			=	0;
 				$data['titles']				=	Array();
 				$data['parent_path']		=	Array();
 				$data['named_path']			=	Array();
 				$data['file_name']			=	'';
 				$data['template']	=	''; // design
 				$data['item_template']		=	'';
 				$data['children_count'] = 0;
 				$data['left'] = 0;
 				$data['right'] = 2;
 				$data['debug_title'] = 'ROOT';
 				$this->Stack->Push($data);
 			}
 
 			if (!isset($data['queried'])) {
 				$this->QueryTitle($data);
 				$this->QueryChildren($data);
 				$data['children_count'] = count($data['children']);
 				$this->QueryPermissions($data);
 				$data['queried'] = 1;
 				$data['right'] = $data['left']+1;
 
 				$sql = $data['perms']->GetInsertSQL();
 
 				if ( $sql ) {
 					$this->Conn->Query($sql);
 					// $this->doneCats++;  // moved to the place where it pops out of the stack by Kostja
 				}
 				$this->iteration++;
 			}
 
 			// start with first child if we haven't started yet
 			if (!isset($data['current_child'])) $data['current_child'] = 0;
 
 			// if we have more children on CURRENT LEVEL
 			if (isset($data['children'][$data['current_child']])) {
 				if ($this->StrictPath) {
 					while ( isset($data['children'][ $data['current_child'] ]) && !in_array($data['children'][ $data['current_child'] ], $this->StrictPath) ) {
 						$data['current_child']++;
 						continue;
 					}
 					if (!isset($data['children'][ $data['current_child'] ])) return false; //error
 				}
 				$next_data = Array();
 				$next_data['titles']			=	$data['titles'];
 				$next_data['parent_path']		=	$data['parent_path'];
 				$next_data['named_path']		=	$data['named_path'];
 				$next_data['template']			=	$data['template'];
 				$next_data['item_template']		=	$data['item_template'];
 				$next_data['current_id']		=	$data['children'][ $data['current_child'] ]; //next iteration should process child
 				$next_data['perms']				=	clone $data['perms']; // copy permissions to child - inheritance
 				$next_data['perms']->SetCatId($next_data['current_id']);
 				$next_data['left'] = $data['right'];
 				$data['current_child']++;
 				$this->Stack->Update($data); //we need to update ourself for the iteration after the next (or further) return to next child
 				$this->Stack->Push($next_data); //next iteration should process this child
 				return true;
 			}
 			else {
 				$this->Stack->Update($data);
 				$prev_data = $this->Stack->Pop(); //remove ourself from stack if we have finished all the childs (or there are none)
 				$data['right'] = $prev_data['right'];
 				$this->UpdateCachedPath($data);
 				// we are getting here if we finished with current level, so check if it's first level - then bail out.
 
 				$this->doneCats++; // moved by Kostja from above, seems to fix the prob
 				$has_more = $this->Stack->Count() > 0;
 				if ($has_more) {
 					$next_data = $this->Stack->Get();
 					$next_data['right'] = $data['right']+1;
 					$next_data['children_count'] += $data['children_count'];
 					$this->Stack->Update($next_data);
 				}
 				return $has_more;
 			}
 		}
 
 		function UpdateCachedPath(&$data)
 		{
 			if ( $data['current_id'] == 0 ) {
 				// don't update non-existing "Home" category
 				return;
 			}
 
 			// allow old fashion system templates to work (maybe this is no longer needed, since no such urls after upgrade from 4.3.1)
 			$named_parent_path = strpos($data['file_name'], '/') !== false ? $data['file_name'] : implode('/', $data['named_path']);
 
 			$fields_hash = Array (
 				'ParentPath' => '|' . implode('|', $data['parent_path']) . '|',
 				'NamedParentPath' => $named_parent_path, // url component for a category page
 				'NamedParentPathHash' => kUtil::crc32(mb_strtolower(preg_replace('/^Content\//i', '', $named_parent_path))),
 				'CachedTemplate' => $data['template'], // actual template to use when category is visited
 				'CachedTemplateHash' => kUtil::crc32(mb_strtolower($data['template'])),
 				'CachedDescendantCatsQty' => $data['children_count'],
 				'TreeLeft' => $data['left'],
 				'TreeRight' => $data['right'],
 			);
 
 			foreach ($this->languages as $language_id) {
 				$fields_hash['l' . $language_id . '_CachedNavbar'] = implode('&|&', $data['titles'][$language_id]);
 			}
 
 			$this->Conn->doUpdate($fields_hash, TABLE_PREFIX . 'Categories', 'CategoryId = ' . $data['current_id']);
 
 			if ( $this->Conn->getAffectedRows() > 0 ) {
 				$this->Application->incrementCacheSerial('c', $data['current_id']);
 			}
 		}
 
 		function QueryTitle(&$data)
 		{
 			$category_id = $data['current_id'];
 			$sql = 'SELECT *
 					FROM '.TABLE_PREFIX.'Categories
 					WHERE CategoryId = '.$category_id;
 
 			$record = $this->Conn->GetRow($sql);
 			if ($record) {
 
 				foreach ($this->languages as $language_id) {
 					$data['titles'][$language_id][] = $record['l'.$language_id.'_Name'] ? $record['l'.$language_id.'_Name'] : $record['l'.$this->primaryLanguageId.'_Name'];
 				}
 
 				$data['debug_title'] = $record['l1_Name'];
 
 				$data['parent_path'][] = $category_id;
 				$data['named_path'][] = preg_replace('/^Content\\//', '', $record['Filename']);
 				$data['file_name'] = $record['Filename'];
 
 				// it is one of the modules root category
 				/*$root_prefix = isset($this->root_prefixes[$category_id]) ? $this->root_prefixes[$category_id] : false;
 				if ( $root_prefix ) {
 					$fields_hash = Array ();
 					if ( !$record['Template'] ) {
 						$record['Template'] = $this->Application->ConfigValue($root_prefix . '_CategoryTemplate');
 						$fields_hash['Template'] = $record['Template'];
 					}
 
 					$this->Conn->doUpdate($fields_hash, TABLE_PREFIX . 'Categories', 'CategoryId = ' . $category_id);
 				}*/
 
 				// if explicitly set, then use it; use parent template otherwise
 				if ($record['Template'] && ($record['Template'] != CATEGORY_TEMPLATE_INHERIT)) {
 					$data['template'] = $record['Template'];
 				}
 			}
 
 		}
 
 		function QueryChildren(&$data)
 		{
 			$sql = 'SELECT CategoryId
 					FROM '.TABLE_PREFIX.'Categories
 					WHERE ParentId = '.$data['current_id'];
 			 $data['children'] = $this->Conn->GetCol($sql);
 		}
 
 		function QueryPermissions(&$data)
 		{
 			// don't search for section "view" permissions here :)
 			$sql = 'SELECT ipc.PermissionConfigId, ip.GroupId, ip.PermissionValue
 					FROM '.TABLE_PREFIX.'Permissions AS ip
 					LEFT JOIN '.TABLE_PREFIX.'CategoryPermissionsConfig AS ipc ON ipc.PermissionName = ip.Permission
 					WHERE (CatId = '.$data['current_id'].') AND (Permission LIKE "%.VIEW") AND (ip.Type = 0)';
 
 			$records = $this->Conn->Query($sql);
 
 			//create permissions array only if we don't have it yet (set by parent)
 			if (!isset($data['perms'])) {
 				$data['perms'] = new clsCachedPermissions($data['current_id'], $this->permCacheTable);
 			}
 
 			foreach ($records as $record) {
 				if ($record['PermissionValue'] == 1) {
 					$data['perms']->AddAllow($record['PermissionConfigId'], $record['GroupId']);
 				}
 				else {
 					$data['perms']->AddDeny($record['PermissionConfigId'], $record['GroupId']);
 				}
 			}
 		}
 
 		/**
 		 * Rebuild all cache in one step
 		 *
 		 * @param string $path
 		 * @return void
 		 */
 		function OneStepRun($path = '')
 		{
 			$this->InitUpdater();
 			$needs_more = true;
 
 			while ($needs_more) {
 				// until proceeded in this step category count exceeds category per step limit
 				$needs_more = $this->DoTheJob();
 			}
 
 			$this->SaveData();
 		}
 	}
Index: branches/5.3.x/core/units/themes/themes_tag_processor.php
===================================================================
--- branches/5.3.x/core/units/themes/themes_tag_processor.php	(revision 16518)
+++ branches/5.3.x/core/units/themes/themes_tag_processor.php	(revision 16519)
@@ -1,36 +1,36 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class ThemesTagProcessor extends kDBTagProcessor
 	{
 		function StylesheetFile($params)
 		{
 			// not using theme-based stylesheets anymore
 			trigger_error('Tag "StylesheetFile" is depricated and should not be used.', E_USER_NOTICE);
 
 			return '';
 		}
 
 		function SelectedTheme($params)
 		{
 			$object = $this->getObject($params);
 
+			/** @var kThemesHelper $themes_helper */
 			$themes_helper = $this->Application->recallObject('ThemesHelper');
-			/* @var $themes_helper kThemesHelper */
 
 			return $object->GetDBField('ThemeId') == $themes_helper->getCurrentThemeId();
 		}
 	}
Index: branches/5.3.x/core/units/themes/themes_eh.php
===================================================================
--- branches/5.3.x/core/units/themes/themes_eh.php	(revision 16518)
+++ branches/5.3.x/core/units/themes/themes_eh.php	(revision 16519)
@@ -1,263 +1,263 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class ThemesEventHandler extends kDBEventHandler {
 
 		/**
 		 * Allows to override standard permission mapping
 		 *
 		 * @return void
 		 * @access protected
 		 * @see kEventHandler::$permMapping
 		 */
 		protected function mapPermissions()
 		{
 			parent::mapPermissions();
 
 			$permissions = Array(
 				'OnChangeTheme' => Array('self' => true),
 			);
 
 			$this->permMapping = array_merge($this->permMapping, $permissions);
 		}
 
 		/**
 		 * Checks user permission to execute given $event
 		 *
 		 * @param kEvent $event
 		 * @return bool
 		 * @access public
 		 */
 		public function CheckPermission(kEvent $event)
 		{
 			if ( $event->Name == 'OnItemBuild' ) {
 				// check permission without using $event->getSection(),
 				// so first cache rebuild won't lead to "ldefault_Name" field being used
 				return true;
 			}
 
 			return parent::CheckPermission($event);
 		}
 
 		/**
 		 * Ensure, that current object is always taken from live table.
 		 *
 		 * @param kDBBase|kDBItem|kDBList $object Object.
 		 * @param kEvent                  $event  Event.
 		 *
 		 * @return void
 		 */
 		protected function dbBuild(&$object, kEvent $event)
 		{
 			if ( $event->Special == 'current' ) {
 				$event->setEventParam('live_table', true);
 			}
 
 			parent::dbBuild($object, $event);
 		}
 
 		/**
 		 * Ensures that current theme detection will fallback to primary without extra DB query.
 		 *
 		 * @param kEvent $event Event.
 		 *
 		 * @return integer
 		 */
 		public function getPassedID(kEvent $event)
 		{
 			if ( $event->Special == 'current' ) {
 				$theme_id = $this->Application->GetVar('m_theme');
 
 				if ( !$theme_id ) {
 					$theme_id = 'default';
 				}
 				else {
 					$event->setEventParam(kEvent::FLAG_ID_FROM_REQUEST, true);
 				}
 
 				$this->Application->SetVar('m_theme', $theme_id);
 				$this->Application->SetVar($event->getPrefixSpecial() . '_id', $theme_id);
 
 				return $theme_id;
 			}
 
 			return parent::getPassedID($event);
 		}
 
 		/**
 		 * Allows to set selected theme as primary
 		 *
 		 * @param kEvent $event
 		 */
 		function OnSetPrimary($event)
 		{
 			if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
 				$event->status = kEvent::erFAIL;
 				return;
 			}
 
 			$ids = $this->StoreSelectedIDs($event);
 			if ($ids) {
 				$id = array_shift($ids);
 				$this->setPrimary($id);
 
 				$this->Application->HandleEvent(new kEvent('adm:OnRebuildThemes'));
 			}
 
 			$this->clearSelectedIDs($event);
 		}
 
 		function setPrimary($id)
 		{
 			$config = $this->getUnitConfig();
 			$table_name = $config->getTableName();
 
 			$sql = 'UPDATE '.$table_name.'
 					SET PrimaryTheme = 0';
 			$this->Conn->Query($sql);
 
 
 			$sql = 'UPDATE '.$table_name.'
 					SET PrimaryTheme = 1, Enabled = 1
 					WHERE '. $config->getIDField() .' = '.$id;
 			$this->Conn->Query($sql);
 		}
 
 		/**
 		 * Validate entered stylesheet path.
 		 *
 		 * @param kEvent $event Event.
 		 *
 		 * @return void
 		 */
 		protected function OnBeforeItemUpdate(kEvent $event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
 			/** @var ThemeItem $object */
 			$object = $event->getObject();
 
 			if ( $object->GetDBField('StylesheetFile') && !$object->getStylesheetFile() ) {
 				$object->SetError('StylesheetFile', 'not_found');
 			}
 		}
 
 		/**
 		 * Set's primary theme (when checkbox used on editing form)
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterCopyToLive(kEvent $event)
 		{
 			parent::OnAfterCopyToLive($event);
 
+			/** @var kDBItem $object */
 			$object = $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true, 'live_table' => true));
-			/* @var $object kDBItem */
 
 			$object->Load($event->getEventParam('id'));
 
 			if ( $object->GetDBField('PrimaryTheme') ) {
 				$this->setPrimary($event->getEventParam('id'));
 			}
 		}
 
 		/**
 		 * Also rebuilds theme files, when enabled theme is saved
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnSave(kEvent $event)
 		{
 			parent::OnSave($event);
 
 			if ( ($event->status != kEvent::erSUCCESS) || !$event->getEventParam('ids') ) {
 				return ;
 			}
 
 			$config = $event->getUnitConfig();
 			$ids = $event->getEventParam('ids');
 
 			$sql = 'SELECT COUNT(*)
 					FROM ' . $config->getTableName() . '
 					WHERE ' . $config->getIDField() . ' IN (' . $ids . ') AND (Enabled = 1)';
 			$enabled_themes = $this->Conn->GetOne($sql);
 
 			if ( $enabled_themes ) {
 				$this->Application->HandleEvent(new kEvent('adm:OnRebuildThemes'));
 			}
 		}
 
 		/**
 		 * Allows to change the theme
 		 *
 		 * @param kEvent $event
 		 */
 		function OnChangeTheme($event)
 		{
 			if ($this->Application->isAdminUser) {
 				// for structure theme dropdown
 				$this->Application->StoreVar('theme_id', $this->Application->GetVar('theme'));
 				$this->Application->StoreVar('RefreshStructureTree', 1);
 				return ;
 			}
 
 			$this->Application->SetVar('t', 'index');
 			$this->Application->SetVar('m_cat_id', 0);
 
 			$this->Application->SetVar('m_theme', $this->Application->GetVar('theme'));
 		}
 
 		/**
 		 * Apply system filter to themes list
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
 		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			if ( in_array($event->Special, Array ('enabled', 'selected', 'available')) || !$this->Application->isAdminUser ) {
 				// "enabled" special or Front-End
 				$object->addFilter('enabled_filter', '%1$s.Enabled = ' . STATUS_ACTIVE);
 			}
 
 			// site domain theme picker
 			if ( $event->Special == 'selected' || $event->Special == 'available' ) {
+				/** @var EditPickerHelper $edit_picker_helper */
 				$edit_picker_helper = $this->Application->recallObject('EditPickerHelper');
-				/* @var $edit_picker_helper EditPickerHelper */
 
 				$edit_picker_helper->applyFilter($event, 'Themes');
 			}
 
 			// apply domain-based theme filtering
 			$themes = $this->Application->siteDomainField('Themes');
 
 			if ( strlen($themes) ) {
 				$themes = explode('|', substr($themes, 1, -1));
 				$object->addFilter('domain_filter', '%1$s.ThemeId IN (' . implode(',', $themes) . ')');
 			}
 		}
 	}
Index: branches/5.3.x/core/units/country_states/country_state_eh.php
===================================================================
--- branches/5.3.x/core/units/country_states/country_state_eh.php	(revision 16518)
+++ branches/5.3.x/core/units/country_states/country_state_eh.php	(revision 16519)
@@ -1,155 +1,155 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2010 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class CountryStateEventHandler extends kDBEventHandler {
 
 		/**
 		 * Allows to override standard permission mapping
 		 *
 		 * @return void
 		 * @access protected
 		 * @see kEventHandler::$permMapping
 		 */
 		protected function mapPermissions()
 		{
 			parent::mapPermissions();
 
 			$permissions = Array (
 				'OnGetStatesJSON' => Array ('self' => true),
 			);
 
 			$this->permMapping = array_merge($this->permMapping, $permissions);
 		}
 
 		/**
 		 * Applies edit picker filters
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
 		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			if ( ($event->Special == 'selected') || ($event->Special == 'available') ) {
+				/** @var EditPickerHelper $edit_picker_helper */
 				$edit_picker_helper = $this->Application->recallObject('EditPickerHelper');
-				/* @var $edit_picker_helper EditPickerHelper */
 
 				$edit_picker_helper->applyFilter($event, 'Countries');
 
 				// only countries
 				$object->addFilter('type_filter', '%1$s.Type = ' . DESTINATION_TYPE_COUNTRY);
 			}
 		}
 
 		/**
 		 * Makes sure, that state country is always specified
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemCreate(kEvent $event)
 		{
 			parent::OnBeforeItemCreate($event);
 
 			$this->_setRequired($event);
 		}
 
 		/**
 		 * Makes sure, that state country is always specified
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemUpdate(kEvent $event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
 			$this->_setRequired($event);
 		}
 
 		/**
 		 * Makes sure, that state country is always specified
 		 *
 		 * @param kEvent $event
 		 */
 		function _setRequired($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$field_options = $object->GetFieldOptions('IsoCode');
 
 			if ($object->GetDBField('Type') == DESTINATION_TYPE_STATE) {
 				$object->setRequired('StateCountryId');
 				$field_options['unique'] = Array ('Type', 'StateCountryId');
 			}
 			else {
 				$object->setRequired('StateCountryId', false);
 				$field_options['unique'] = Array ('Type');
 			}
 
 			$object->SetFieldOptions('IsoCode', $field_options);
 		}
 
 		/**
 		 * Don't allow to delete countries, that have states
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemDelete(kEvent $event)
 		{
 			parent::OnBeforeItemDelete($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
+			/** @var kCountryStatesHelper $cs_helper */
 			$cs_helper = $this->Application->recallObject('CountryStatesHelper');
-			/* @var $cs_helper kCountryStatesHelper */
 
 			if ( $cs_helper->CountryHasStates($object->GetDBField('IsoCode')) ) {
 				$event->status = kEvent::erFAIL;
 				return;
 			}
 		}
 
 		/**
 		 * Returns given country states in JSON format
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnGetStatesJSON(kEvent $event)
 		{
 			$event->status = kEvent::erSTOP;
 
+			/** @var kCountryStatesHelper $cs_helper */
 			$cs_helper = $this->Application->recallObject('CountryStatesHelper');
-			/* @var $cs_helper kCountryStatesHelper */
 
 			$states = $cs_helper->getStates( (string)$this->Application->GetVar('country_iso') );
 			echo json_encode($states);
 		}
 	}
Index: branches/5.3.x/core/units/sections/site_config_tp.php
===================================================================
--- branches/5.3.x/core/units/sections/site_config_tp.php	(revision 16518)
+++ branches/5.3.x/core/units/sections/site_config_tp.php	(revision 16519)
@@ -1,59 +1,59 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class SiteConfigTagProcessor extends kTagProcessor {
 
 		function PrintEditingModes($params)
 		{
 			$editing_modes = Array (
 				EDITING_MODE_BROWSE => Array ('image' => 'browse_site_mode', 'title' => 'la_btn_BrowseMode'),
 				EDITING_MODE_CONTENT => Array ('image' => 'content_mode', 'title' => 'la_btn_ContentMode'),
 				EDITING_MODE_DESIGN => Array ('image' => 'design_mode', 'title' => 'la_btn_DesignMode'),
 			);
 
+			/** @var SiteConfigHelper $site_config_helper */
 			$site_config_helper = $this->Application->recallObject('SiteConfigHelper');
-			/* @var $site_config_helper SiteConfigHelper */
 
 			$settings = $site_config_helper->getSettings();
 
 			foreach ($editing_modes as $editing_mode => $data) {
 				if (!in_array($editing_mode, $settings['visible_editing_modes'])) {
 					unset($editing_modes[$editing_mode]);
 				}
 			}
 
 			if (count($editing_modes) == 1) {
 				// don't show buttons, when there only one left
 				return '';
 			}
 
 			$ret = '';
 			$i = 1;
 			$count = count($editing_modes);
 			$block_params = Array ('name' => $params['render_as']);
 
 			foreach ($editing_modes as $editing_mode => $data) {
 				$block_params = array_merge($block_params, $data);
 				$block_params['editing_mode'] = $editing_mode;
 				$block_params['is_last'] = $i == $count;
 
 				$ret .= $this->Application->ParseBlock($block_params);
 				$i++;
 			}
 
 			return $ret;
 		}
 	}
\ No newline at end of file
Index: branches/5.3.x/core/units/skins/skin_eh.php
===================================================================
--- branches/5.3.x/core/units/skins/skin_eh.php	(revision 16518)
+++ branches/5.3.x/core/units/skins/skin_eh.php	(revision 16519)
@@ -1,160 +1,160 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class SkinEventHandler extends kDBEventHandler {
 
 		/**
 		 * Allows to override standard permission mapping
 		 *
 		 * @return void
 		 * @access protected
 		 * @see kEventHandler::$permMapping
 		 */
 		protected function mapPermissions()
 		{
 			parent::mapPermissions();
 
 			$permissions = Array (
 				'OnItemBuild' => Array ('self' => true),
 			);
 
 			$this->permMapping = array_merge($this->permMapping, $permissions);
 		}
 
 		/**
 		 * With "primary" special loads primary skin
 		 *
 		 * @param kEvent $event
 		 * @return int
 		 * @access public
 		 */
 		public function getPassedID(kEvent $event)
 		{
 			if ( $event->Special == 'primary' ) {
 				return Array ('IsPrimary' => 1);
 			}
 
 			return parent::getPassedID($event);
 		}
 
 		/**
 		 * Allows to set selected theme as primary
 		 *
 		 * @param kEvent $event
 		 */
 		function OnSetPrimary($event)
 		{
 			if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
 				$event->status = kEvent::erFAIL;
 				return;
 			}
 
 			$ids = $this->StoreSelectedIDs($event);
 			if ($ids) {
 				$id = array_shift($ids);
 				$this->setPrimary($id);
 			}
 
 			$this->clearSelectedIDs($event);
 		}
 
 		function setPrimary($id)
 		{
 			$config = $this->getUnitConfig();
 			$table_name = $config->getTableName();
 
 			$sql = 'UPDATE '.$table_name.'
 					SET IsPrimary = 0';
 			$this->Conn->Query($sql);
 
 
 			$sql = 'UPDATE '.$table_name.'
 					SET IsPrimary = 1
 					WHERE '. $config->getIDField() .' = '.$id;
 			$this->Conn->Query($sql);
 		}
 
 		/**
 		 * Don't make cloned skin primary
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeClone(kEvent $event)
 		{
 			parent::OnBeforeClone($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$object->SetDBField('IsPrimary', 0);
 		}
 
 		/**
 		 * Re-compile skin, after it's changed (live table only)
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemUpdate(kEvent $event)
 		{
 			parent::OnAfterItemUpdate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			if ( !$object->IsTempTable() ) {
+				/** @var SkinHelper $skin_helper */
 				$skin_helper = $this->Application->recallObject('SkinHelper');
-				/* @var $skin_helper SkinHelper */
 
 				$skin_helper->compile($object);
 			}
 		}
 
 		/**
 		 * [HOOK] Compile stylesheet file based on theme definitions
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnCompileStylesheet($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject( Array ('skip_autoload' => true) );
-			/* @var $object kDBItem */
 
 			$object->SwitchToLive();
 
 			$ids = $event->MasterEvent->getEventParam('ids');
 			if ( !is_array($ids) ) {
 				$ids = explode(',', $ids);
 			}
 
 			if ( !$ids ) {
 				return ;
 			}
 
+			/** @var SkinHelper $skin_helper */
 			$skin_helper = $this->Application->recallObject('SkinHelper');
-			/* @var $skin_helper SkinHelper */
 
 			foreach ($ids as $id) {
 				$object->Load($id);
 				$skin_helper->compile($object);
 			}
 		}
 	}
\ No newline at end of file
Index: branches/5.3.x/core/units/promo_blocks/promo_block_tp.php
===================================================================
--- branches/5.3.x/core/units/promo_blocks/promo_block_tp.php	(revision 16518)
+++ branches/5.3.x/core/units/promo_blocks/promo_block_tp.php	(revision 16519)
@@ -1,91 +1,91 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class PromoBlockTagProcessor extends kDBTagProcessor {
 
 	/**
 	 * Returns link that registers promotion click and redirect user to the page, associated with the promotion
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function PromoLink($params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		$url_params = Array (
 			$this->Prefix . '_event' => 'OnFollowLink',
 			'pass' => 'm,' . $this->Prefix,
 			'__NO_REWRITE__' => 1,
 		);
 
 		return $this->Application->HREF('index', '', $url_params);
 	}
 
 	/**
 	 * Checks, that link should be opened in new window
 	 *
 	 * @param Array $params
 	 * @return bool
 	 * @access protected
 	 */
 	protected function LinkInNewWindow($params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		if ( $object->GetDBField('LinkType') == 1 ) { // Internal
 			return false;
 		}
 
 		return $object->GetDBField('OpenInNewWindow');
 	}
 
 	/**
 	 * Get value from corresponding PromoGroupBlocks record
 	 *
 	 * @param Array $params
 	 * @return bool
 	 * @access protected
 	 */
 	protected function GetGroupSetting(Array $params)
 	{
 		static $group_data = null;
 
 		if ( !isset($group_data) ) {
 			if ( isset($params['group_id']) && $params['group_id'] ) {
 				$group_id = $params['group_id'];
 			}
 			else {
+				/** @var CategoriesItem $page */
 				$page = $this->Application->recallObject('st');
-				/* @var $page CategoriesItem */
 
 				$group_id = $page->GetDBField('PromoBlockGroupId');
 			}
 
 			$sql = 'SELECT *
 					FROM ' . TABLE_PREFIX . 'PromoBlockGroups
 					WHERE PromoBlockGroupId = ' . (int)$group_id;
 			$group_data = $this->Conn->GetRow($sql);
 		}
 
 		$setting_name = $params['name'];
 
 		return isset($group_data[$setting_name]) ? $group_data[$setting_name] : '';
 	}
 }
Index: branches/5.3.x/core/units/promo_blocks/promo_block_eh.php
===================================================================
--- branches/5.3.x/core/units/promo_blocks/promo_block_eh.php	(revision 16518)
+++ branches/5.3.x/core/units/promo_blocks/promo_block_eh.php	(revision 16519)
@@ -1,352 +1,352 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class PromoBlockEventHandler extends kDBEventHandler {
 
 	/**
 	 * Define alternative event processing method names
 	 *
 	 * @return void
 	 * @see kEventHandler::$eventMethods
 	 * @access protected
 	 */
 	protected function mapEvents()
 	{
 		parent::mapEvents();
 
 		$events_map = Array (
 			'OnMassMoveUp' => 'OnChangePriority',
 			'OnMassMoveDown' => 'OnChangePriority',
 		);
 
 		$this->eventMethods = array_merge($this->eventMethods, $events_map);
 	}
 
 	/**
 	 * Allows to override standard permission mapping
 	 *
 	 * @return void
 	 * @access protected
 	 * @see kEventHandler::$permMapping
 	 */
 	protected function mapPermissions()
 	{
 		parent::mapPermissions();
 
 		$permissions = Array (
 			'OnItemBuild' => Array ('self' => true),
 			'OnSetSticky' => Array ('self' => 'view'),
 			'OnRegisterView' => Array ('self' => true),
 			'OnFollowLink' => Array ('self' => true),
 			'OnResetCounters' => Array ('self' => 'add|edit'),
 		);
 
 		$this->permMapping = array_merge($this->permMapping, $permissions);
 	}
 
 	/**
 	 * Sets default value for promo block group
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnPreCreate(kEvent $event)
 	{
 		parent::OnPreCreate($event);
 
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
+		/** @var kDBItem $promo_block_group */
 		$promo_block_group = $this->Application->recallObject('promo-block-group');
-		/* @var $promo_block_group kDBItem */
 
 		$object->SetDBField('PromoBlockGroupId', $promo_block_group->GetID());
 	}
 
 	/**
 	 * Processes OnMassMoveUp, OnMassMoveDown events
 	 *
 	 * @param kEvent $event
 	 */
 	function OnChangePriority($event)
 	{
 		$this->Application->SetVar('priority_prefix', $event->getPrefixSpecial());
 		$event->CallSubEvent('priority:' . $event->Name);
 	}
 
 	/**
 	 * Apply any custom changes to list's sql query
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 * @see kDBEventHandler::OnListBuild()
 	 */
 	protected function SetCustomQuery(kEvent $event)
 	{
 		parent::SetCustomQuery($event);
 
+		/** @var kDBList $object */
 		$object = $event->getObject();
-		/* @var $object kDBList */
 
 		if ( $this->Application->isAdmin ) {
+			/** @var kDBItem $promo_block_group */
 			$promo_block_group = $this->Application->recallObject('promo-block-group');
-			/* @var $promo_block_group kDBItem */
 
 			$object->addFilter('promo_group_filter', '%1$s.PromoBlockGroupId = ' . $promo_block_group->GetID());
 			return;
 		}
 
 		$group_id = $event->getEventParam('group_id');
 
 		if ( !$group_id ) {
+			/** @var CategoriesItem $page */
 			$page = $this->Application->recallObject('st');
-			/* @var $page CategoriesItem */
 
 			$group_id = $page->GetDBField('PromoBlockGroupId');
 		}
 
 		$object->addFilter('status_filter', '%1$s.Status = ' . STATUS_ACTIVE);
 		$object->addFilter('scheduled_from_filter', '%1$s.ScheduleFromDate IS NULL OR %1$s.ScheduleFromDate <= ' . TIMENOW);
 		$object->addFilter('scheduled_to_filter', '%1$s.ScheduleToDate IS NULL OR %1$s.ScheduleToDate >= ' . TIMENOW);
 		$object->addFilter('promo_group_filter', $group_id ? '%1$s.PromoBlockGroupId = ' . $group_id : 'FALSE');
 	}
 
 	/**
 	 * Set's block as sticky
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnSetSticky(kEvent $event)
 	{
+		/** @var kDBItem $object */
 		$object = $event->getObject( Array('skip_autoload' => true) );
-		/* @var $object kDBItem */
 
 		$ids = $this->StoreSelectedIDs($event);
 
 		if ( $ids ) {
 			$id = array_shift($ids);
 
 			$sql = 'UPDATE ' . $object->TableName . '
 					SET Sticky = 0';
 			$this->Conn->Query($sql);
 
 			$sql = 'UPDATE ' . $object->TableName . '
 					SET Sticky = 1, Status = ' . STATUS_ACTIVE . '
 					WHERE BlockId = ' . $id;
 			$this->Conn->Query($sql);
 		}
 
 		$this->clearSelectedIDs($event);
 	}
 
 
 	/**
 	 * Set Required fields
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnBeforeItemCreate(kEvent $event)
 	{
 		parent::OnBeforeItemCreate($event);
 
 		$this->_itemChanged($event);
 	}
 
 	/**
 	 * Set Required fields
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnBeforeItemUpdate(kEvent $event)
 	{
 		parent::OnBeforeItemUpdate($event);
 
 		$this->_itemChanged($event);
 	}
 
 	/**
 	 * Schedule dates
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function _itemChanged(kEvent $event)
 	{
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		$date_from = $object->GetDBField('ScheduleFromDate_date');
 		$date_to = $object->GetDBField('ScheduleToDate_date');
 
 		if ( $date_from && $date_to && $date_from >= $date_to ) {
 			$object->SetError('ScheduleFromDate_date', 'wrong_date_interval');
 		}
 
 		$object->setRequired('CategoryId', $object->GetDBField('LinkType') == PromoBlockType::INTERNAL);
 		$object->setRequired('ExternalLink', $object->GetDBField('LinkType') == PromoBlockType::EXTERNAL);
 	}
 
 	/**
 	 * Registers view of the promo block
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnRegisterView(kEvent $event)
 	{
 		$this->_incrementField($event, 'NumberOfViews');
 	}
 
 	/**
 	 * Registers click on the promo block
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnFollowLink(kEvent $event)
 	{
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		$this->_incrementField($event, 'NumberOfClicks', false);
 
 		if ( $object->GetDBField('LinkType') == 1 ) { // Internal
 			$sql = 'SELECT NamedParentPath
 					FROM ' . TABLE_PREFIX . 'Categories
 					WHERE CategoryId = ' . $object->GetDBField('CategoryId');
 			$event->redirect = $this->Conn->GetOne($sql);
 
 			$event->SetRedirectParam('pass', 'm');
 		}
 		else {
 			$ext_url = $object->GetDBField('ExternalLink');
 			$event->redirect = 'external:' . (preg_match('/^(http|ftp):\\/\\/.*/', $ext_url) ? $ext_url : $this->Application->BaseURL() . $ext_url);
 		}
 	}
 
 	/**
 	 * Increment given promo block counters
 	 *
 	 * @param kEvent $event
 	 * @param string $field
 	 * @param bool $is_ajax
 	 * @return void
 	 * @access protected
 	 */
 	protected function _incrementField(kEvent $event, $field, $is_ajax = true)
 	{
 		if ( $is_ajax ) {
 			$event->status = kEvent::erSTOP;
 
 			if ( $this->Application->GetVar('ajax') != 'yes' ) {
 				return ;
 			}
 		}
 
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		if ( !$object->isLoaded() ) {
 			echo 'FAILED';
 			return ;
 		}
 
 		// don't use kDBItem::Update to support concurrent view updates from different visitors
 		$sql = 'UPDATE ' . $object->TableName . '
 				SET ' . $field . ' = ' . $field . ' + 1
 				WHERE ' . $object->IDField . ' = ' . $object->GetID();
 		$this->Conn->Query($sql);
 
 		echo 'OK';
 	}
 
 	/**
 	 * Resets promo block counters
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnResetCounters(kEvent $event)
 	{
+		/** @var kDBItem $object */
 		$object = $event->getObject( Array ('skip_autoload' => true) );
-		/* @var $object kDBItem */
 
 		$ids = $this->StoreSelectedIDs($event);
 
 		foreach ($ids as $id) {
 			$object->Load($id);
 			$object->SetDBField('NumberOfViews', 0);
 			$object->SetDBField('NumberOfClicks', 0);
 			$object->Update();
 		}
 
 		$this->clearSelectedIDs($event);
 	}
 
 	/**
 	 * Occurs, when config was parsed, allows to change config data dynamically
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnAfterConfigRead(kEvent $event)
 	{
 		parent::OnAfterConfigRead($event);
 
+		/** @var CategoryHelper $category_helper */
 		$category_helper = $this->Application->recallObject('CategoryHelper');
-		/* @var $category_helper CategoryHelper */
 
 		$config = $event->getUnitConfig();
 		$fields = $config->getFields();
 
 		$fields['CategoryId']['options'] = $category_helper->getStructureTreeAsOptions();
 
 		// images multilang fields
 		$a_image = Array(
 			'type' => 'string', 'max_len' => 255,
 			'formatter' => 'kUploadFormatter', 'upload_dir' => IMAGES_PATH . 'promo_blocks/',
 			'multiple' => 1, 'thumb_format' => 'resize:100x100',
 			'file_types' => '*.jpg;*.jpeg;*.gif;*.png;*.bmp', 'files_description' => '!la_hint_ImageFiles!',
 			'not_null' => 1, 'default' => '',
 		);
 
 		// get active languages
 		$sql = 'SELECT LanguageId
 				FROM ' . TABLE_PREFIX . 'Languages';
 		$languages = $this->Conn->GetCol($sql);
 
 		foreach ($languages as $lang_id) {
 			$fields['l' . $lang_id . '_Image'] = $a_image;
 		}
 
 		$fields['l' . $this->Application->GetDefaultLanguageId() . '_Image']['required'] = 1;
 
 		$config->setFields($fields);
 	}
 }
Index: branches/5.3.x/core/units/translator/translator_event_handler.php
===================================================================
--- branches/5.3.x/core/units/translator/translator_event_handler.php	(revision 16518)
+++ branches/5.3.x/core/units/translator/translator_event_handler.php	(revision 16519)
@@ -1,182 +1,182 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class TranslatorEventHandler extends kDBEventHandler
 	{
 		/**
 		 * Allows to override standard permission mapping
 		 *
 		 * @return void
 		 * @access protected
 		 * @see kEventHandler::$permMapping
 		 */
 		protected function mapPermissions()
 		{
 			parent::mapPermissions();
 
 			$permissions = Array(
 				'OnChangeLanguage'	=>	Array('subitem' => 'add|edit'),
 				'OnSaveAndClose'	=>	Array('subitem' => 'add|edit'),
 			);
 
 			$this->permMapping = array_merge($this->permMapping, $permissions);
 		}
 
 		/**
 		 * Check permission of item, that being translated
 		 *
 		 * @param kEvent $event
 		 * @return bool
 		 * @access public
 		 */
 		public function CheckPermission(kEvent $event)
 		{
 			list($prefix, ) = $this->getPrefixAndField($event);
 
 			$top_prefix = $this->Application->GetTopmostPrefix($prefix, true);
 			$event->setEventParam('top_prefix', $top_prefix);
 
 			return parent::CheckPermission($event);
 		}
 
 
 		/**
 		 * Returns prefix and field being translated
 		 *
 		 * @param kEvent $event
 		 */
 		function getPrefixAndField($event)
 		{
 			$field = $this->Application->GetVar($event->getPrefixSpecial(true).'_field');
 
 			if (strpos($field,':') !== false) {
 				list($prefix, $field) = explode(':', $field);
 			}
 			else {
 				$prefix = $this->Application->GetVar($event->getPrefixSpecial(true).'_prefix');
 			}
 			return Array($prefix, $field);
 		}
 
 		/**
 		 * Loads record to be translated
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnLoad($event)
 		{
 			list($obj_prefix, $field) = $this->getPrefixAndField($event);
 
+			/** @var kDBItem $object */
 			$object = $this->Application->recallObject($obj_prefix);
-			/* @var $object kDBItem */
 
+			/** @var kDBItem $translator */
 			$translator = $event->getObject();
-			/* @var $translator kDBItem */
 
 			$def_lang = $this->Application->GetDefaultLanguageId();
 
 			$current_lang = $translator->GetDBField('Language');
 			if (!$current_lang) $current_lang = $this->Application->RecallVar('trans_lang');
 			if (!$current_lang) $current_lang = $this->Application->GetVar('m_lang');
 			/*if ($current_lang == $def_lang) {
 				$current_lang = $def_lang + 1;
 			}*/
 			$this->Application->StoreVar('trans_lang', $current_lang); //remember translation language for user friendlyness
 
 			$translator->SetID(1);
 			$translator->SetDBField('Original', $object->GetDBField('l'.$this->Application->GetVar('m_lang').'_'.$field));
 			$translator->SetDBField('Language', $current_lang);
 			$translator->SetDBField('SwitchLanguage', $current_lang);
 
 			$translator->SetDBField('Translation', $object->GetDBField('l'.$current_lang.'_'.$field));
 
+			/** @var LanguagesItem $cur_lang */
 			$cur_lang = $this->Application->recallObject('lang.current');
-			/* @var $cur_lang LanguagesItem */
 
 			$cur_lang->Load($current_lang);
 
 			$translator->SetDBField('Charset', CHARSET);
 
 			$event->redirect = false;
 		}
 
 		/**
 		 * Saves changes into temporary table and closes editing window
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnSaveAndClose($event)
 		{
 			$event->CallSubEvent('OnPreSave');
 
 			$event->SetRedirectParam('opener', 'u');
 		}
 
 		/**
 		 * Saves edited item into temp table
 		 * If there is no id, new item is created in temp table
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnPreSave(kEvent $event)
 		{
+			/** @var kDBItem $translator */
 			$translator = $event->getObject();
-			/* @var $translator kDBItem */
 
 			$field_values = $this->getSubmittedFields($event);
 			$translator->SetFieldsFromHash($field_values);
 			$event->setEventParam('form_data', $field_values);
 
 			list($obj_prefix, $field) = $this->getPrefixAndField($event);
 
+			/** @var kDBItem $object */
 			$object = $this->Application->recallObject($obj_prefix);
-			/* @var $object kDBItem */
 
 			$lang = $translator->GetDBField('Language');
 
 			$object->SetFieldOptions('l' . $lang . '_' . $field, Array ());
 			$object->SetDBField('l' . $lang . '_' . $field, $translator->GetDBField('Translation'));
 			$this->RemoveRequiredFields($object);
 			$object->Update();
 		}
 
 		/**
 		 * Changes current language in translation popup
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnChangeLanguage($event)
 		{
 			$event->CallSubEvent('OnPreSave');
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$object->SetDBField('Language', $object->GetDBField('SwitchLanguage'));
 
 			$event->CallSubEvent('OnLoad');
 			$event->redirect = false;
 		}
 
 	}
Index: branches/5.3.x/core/units/statistics/statistics_tag_processor.php
===================================================================
--- branches/5.3.x/core/units/statistics/statistics_tag_processor.php	(revision 16518)
+++ branches/5.3.x/core/units/statistics/statistics_tag_processor.php	(revision 16519)
@@ -1,350 +1,350 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class StatisticsTagProcessor extends kDBTagProcessor {
 
 		var $TagCache = Array(); // parsed tag (in sql queries only) values are cached
 
 		var $CurrentSQL = ''; // sql query being currently processed
 		var $PostFormatting = false; // apply formatting to sql query results
 		var $PostFormattingParams = Array(); // post formatting params if any
 
 		function CalculateValue($params)
 	    {
 	    	$object = $this->getObject($params);
 	        $this->CurrentSQL = $object->GetDBField($params['field']);
 
 	        // 1. replace prefix to actual one
 			$this->CurrentSQL = str_replace("<%prefix%>", TABLE_PREFIX, $this->CurrentSQL);
 
 			// 2. replace all pseudo-tags found in sql with their values
 			while ( ($tag = $this->FindTag()) != false ) {
 				$this->CurrentSQL = str_replace('<%'.$tag.'%>', $this->ProcessStatisticTag($tag), $this->CurrentSQL);
 			}
 
 			// 3. query sql and process gathered data
 	        $values = $this->Conn->GetCol($this->CurrentSQL);
 	        if (!$values) return '';
 	        if (!$this->PostFormatting) return array_shift($values);
 
 
     		switch ($this->PostFormatting) {
     			case 'number':
     				// simple-specific postformatting
+					/** @var LanguagesItem $lang */
     				$lang = $this->Application->recallObject('lang.current');
-					/* @var $lang LanguagesItem */
 
     				$value = $lang->formatNumber($value, $this->PostFormattingParams['precision']);
     				break;
 
     			case 'COUNT':
     				// extended postformatting
     				$value = count($values);
     				break;
 
     			case 'SUM':
     				$value = 0;
     				foreach ($values as $cur_value) {
     					$value += $cur_value;
     				}
 
     				if ($this->PostFormattingParams['format_as'] == 'file') {
     					$value = size($value);
     				}
     				break;
 
     			// other type of information (not from db)
     			case 'SysFileSize':
     				$value = size( dir_size(FULL_PATH.'/') );
     				break;
 
     			default: // simple-default postformatting
     				$value = date($this->PostFormatting, array_shift($values));
     				break;
     		}
     		$this->PostFormatting = false;
     		$this->PostFormattingParams = Array();
 
 
 	        return $value;
 
 	    }
 
 	    function FindTag()
 		{
 			// finds tag in current sql & returns it if found, false otherwise
 			$tagOpen = '<%'; $tagClose = '%>';	$tagOpenLen = strlen($tagOpen);
 			$startPos = strpos($this->CurrentSQL, $tagOpen);
 			if( $startPos !== false )
 			{
 				$endPos = strpos($this->CurrentSQL, $tagClose, $startPos);
 				return ($endPos > $startPos) ? substr($this->CurrentSQL, $startPos + $tagOpenLen, $endPos - $startPos - $tagOpenLen) : false;
 			}
 			return false;
 		}
 
 		function ProcessStatisticTag($tag)
 		{
 			$tag = trim($tag);
 			if (isset($this->TagCache[$tag])) {
 				return $this->TagCache[$tag];
 			}
 
+			/** @var kDBItem $object */
 			$object = $this->getObject();
-			/* @var $object kDBItem */
 
 			list($tag_name, $tag_params) = explode(' ', $tag, 2); // 1st - function, 2nd .. nth - params
 			preg_match_all('/([\${}a-zA-Z0-9_.-]+)=(["\']{1,1})(.*?)(?<!\\\)\\2/s', $tag_params, $rets, PREG_SET_ORDER);
 
 			$tag_params = Array();
 			foreach ($rets AS $key => $val){
 				$tag_params[$val[1]] = str_replace(Array('\\' . $val[2], '+'), Array($val[2], ' '), $val[3]);
 			}
 
 			switch ($tag_name) {
 				case 'm:config':
 					// m:config name="<variable_name>"
 					return $this->Application->ConfigValue($tag_params['name']);
 					break;
 
 				case 'm:post_format':
 					// m:post_format field="<field_name>" type="<formatting_type>" precision="2"
+					/** @var LanguagesItem $lang */
 					$lang = $this->Application->recallObject('lang.current');
-					/* @var $lang LanguagesItem */
 
 					switch ($tag_params['type']) {
 						case 'date':
 							$this->PostFormatting = $lang->GetDBField('DateFormat');
 							break;
 
 						case 'time':
 							$this->PostFormatting = $lang->GetDBField('TimeFormat');
 							break;
 
 						case 'currency':
 							$this->PostFormatting = 'number';
 							$this->PostFormattingParams['precision'] = $tag_params['precision'];
 							break;
 					}
 					return $tag_params['field'];
 					break;
 
 				case 'm:custom_action':
 					// m:custom_action sql="empty" action="SysFileSize"
 					$this->PostFormatting = $tag_params['action'];
 					return ($tag_params['sql'] == 'empty') ? 'SELECT 1' : $tag_params['sql'];
 					break;
 
 				case 'modules:get_current':
 					return $object->GetDBField('Module');
 					break;
 
 				case 'm:sql_action':
 					//m:sql_action sql="SHOW TABLES" action="COUNT" field="*"
 					$this->PostFormatting = $tag_params['action'];
 					$this->PostFormattingParams = $tag_params;
 					return $tag_params['sql'];
 					break;
 
 				case 'link:hit_count':
 					if ($tag_params['type'] == 'top') {// by now only top is supported
 						$top_links_count = $this->Application->ConfigValue('Link_TopCount');
 
 						$sql = 'SELECT Hits
 								FROM '.TABLE_PREFIX.'Link
 								ORDER BY Hits DESC LIMIT 0, '.$top_links_count;
 						return $this->getLastRecord($sql, 'Hits');
 					}
 					break;
 
 				case 'article:hit_count':
 					if ($tag_params['type'] == 'top') {// by now only top is supported
 						$top_articles_count = $this->Application->ConfigValue('News_VotesToHot');
 						$min_votes = $this->Application->ConfigValue('News_MinVotes');
 
 						$sql = 'SELECT CachedRating
 								FROM '.TABLE_PREFIX.'News
 								WHERE CachedVotesQty > '.$min_votes.'
 								ORDER BY CachedRating DESC LIMIT 0, '.$top_articles_count;
 						return $this->getLastRecord($sql, 'CachedRating');
 					}
 					break;
 
 				case 'topic:hit_count':
 					if ($tag_params['type'] == 'top') {// by now only top is supported
 						$top_posts_count = $this->Application->ConfigValue('Topic_PostsToPop');
 
 						$sql = 'SELECT Views
 								FROM '.TABLE_PREFIX.'Topic
 								ORDER BY Views DESC LIMIT 0, '.$top_posts_count;
 						return $this->getLastRecord($sql, 'Views');
 					}
 					break;
 
 
 			}
 
 			return '';
 		}
 
 		function getLastRecord($sql, $field)
 		{
 			$records = $this->Conn->GetCol($sql);
 			return count($records) ? array_pop($records) : 0;
 		}
 
 		/**
 		 * Allows to get pending item count for prefix
 		 *
 		 * @param Array $params
 		 * @return int
 		 */
 		function CountPending($params)
 		{
 			$prefix = $params['prefix'];
 			$cache_key = 'statistics.pending[%' . $this->Application->incrementCacheSerial($prefix, null, false) . '%]';
 			$value = $this->Application->getCache($cache_key);
 
 			if ($value === false) {
 				$config = $this->Application->getUnitConfig($prefix);
 				$statistics_info = $this->_getPendingStatisticsInfo($prefix);
 
 				if (!$statistics_info) {
 					return 0;
 				}
 
 				$status_field = $config->getStatusField(true);
 				$this->Conn->nextQueryCachable = true;
 				$sql = 'SELECT COUNT(*)
 						FROM '. $config->getTableName() .'
 						WHERE '.$status_field.' = '.$statistics_info['status'];
 				$value = $this->Conn->GetOne($sql);
 				$this->Application->setCache($cache_key, $value);
 			}
 
 			return $value;
 		}
 
 		/**
 		 * Returns pending statistics info
 		 *
 		 * @param string $prefix
 		 * @return string
 		 * @access protected
 		 */
 		protected function _getPendingStatisticsInfo($prefix)
 		{
 			$config = $this->Application->getUnitConfig($prefix);
 
 			return getArrayValue($config->getStatisticsInfo(), 'pending');
 		}
 
 		function GetTotalPending()
 		{
 			$prefixes = $this->getPendingPrefixes();
 
 			$sum = 0;
 			foreach ($prefixes as $prefix) {
 				$sum += $this->CountPending( Array('prefix' => $prefix) );
 			}
 			return $sum;
 		}
 
 		/**
 		 * Get prefixes, that are allowed to have pending items (check module licenses too)
 		 *
 		 * @return Array
 		 */
 		function getPendingPrefixes()
 		{
+			/** @var kModulesHelper $modules_helper */
 			$modules_helper = $this->Application->recallObject('kModulesHelper');
-			/* @var $modules_helper kModulesHelper */
 
 			$licensed_modules = array_map('strtolower', $modules_helper->_GetModules());
 
 			$sql = 'SELECT LOWER(Module), Prefix
 					FROM '.TABLE_PREFIX.'ItemTypes it
 					LEFT JOIN '.TABLE_PREFIX.'Modules m ON m.Name = it.Module
 					WHERE (m.Loaded = 1) AND (LENGTH(it.ClassName) > 0)';
 			$prefixes = $this->Conn->GetCol($sql, 'Prefix');
 
 			$module_names = array_map('strtolower', array_unique(array_values($prefixes)));
 			$module_names = array_intersect($module_names, $licensed_modules);
 
 			$ret = Array ();
 			foreach ($prefixes as $prefix => $module_name) {
 				if (in_array($module_name, $module_names)) {
 					$ret[] = $prefix;
 				}
 			}
 
 			return $ret;
 
 		}
 
 		function PrintPendingStatistics($params)
 		{
 			$check_prefixes = $this->getPendingPrefixes();
 			if (!$check_prefixes) {
 				return '';
 			}
 
 			$ret = '';
 			$columns = $params['columns'];
 			$block_params = $this->prepareTagParams( Array('name' => $this->SelectParam($params, 'render_as,block') ) );
 
 			$prefixes = Array();
 			foreach ($check_prefixes as $prefix) {
 				$statistics_info = $this->_getPendingStatisticsInfo($prefix);
 				if ($statistics_info) {
 					$prefixes[] = $prefix;
 				}
 			}
 
 			$row_number = 0;
 
 			foreach ($prefixes as $i => $prefix) {
 				$block_params['prefix'] = $prefix;
 				$statistics_info = $this->_getPendingStatisticsInfo($prefix);
 
 				if ($i % $columns == 0) {
 					$column_number = 1;
 					$ret .= '<tr>';
 				}
 
 				$block_params['column_number'] = $column_number;
 				$block_params['is_first'] = $i < $columns ? 1 : 0;
 				$template = $statistics_info['url']['t'];
 				unset($statistics_info['url']['t']);
 				$url = $this->Application->HREF($template, '', $statistics_info['url']);
 				if ($statistics_info['js_url'] != '#url#') {
 					$statistics_info['js_url'] = 'javascript:'.$statistics_info['js_url'];
 				}
 
 				$block_params['url'] = str_replace('#url#', $url, $statistics_info['js_url']);
 				$block_params['icon'] = $statistics_info['icon'];
 				$block_params['label'] = $statistics_info['label'];
 				$ret .= $this->Application->ParseBlock($block_params);
 				$column_number++;
 
 				if (($i+1) % $columns == 0) {
 					$ret .= '</tr>';
 				}
 			}
 			return $ret;
 		}
 
 	}
Index: branches/5.3.x/core/units/statistics/statistics_event_handler.php
===================================================================
--- branches/5.3.x/core/units/statistics/statistics_event_handler.php	(revision 16518)
+++ branches/5.3.x/core/units/statistics/statistics_event_handler.php	(revision 16519)
@@ -1,46 +1,46 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class StatisticsEventHandler extends kDBEventHandler {
 
 		/**
 		 * Allows to show statistics only of requested type
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
 		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			if ( $event->Special == 'summary' ) {
 				$object->addFilter('summary_filter', '%1$s.AdminSummary = 1');
 			}
 
 			$module_list = '';
 			foreach ($this->Application->ModuleInfo as $module_name => $module_info) {
 				$module_list .= $this->Conn->qstr($module_name) . ',';
 			}
 			$module_list = substr($module_list, 0, -1);
 
 			$object->addFilter('status_filter', '%1$s.Module IN (' . $module_list . ')');
 		}
 	}
\ No newline at end of file
Index: branches/5.3.x/core/units/related_searches/related_searches_event_handler.php
===================================================================
--- branches/5.3.x/core/units/related_searches/related_searches_event_handler.php	(revision 16518)
+++ branches/5.3.x/core/units/related_searches/related_searches_event_handler.php	(revision 16519)
@@ -1,39 +1,39 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class RelatedSearchEventHandler extends kDBEventHandler
 	{
 		/**
 		 * Prepares new kDBItem object
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnNew(kEvent $event)
 		{
 			parent::OnNew($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$table_info = $object->getLinkedInfo();
 
 			$source_item_type = $this->Application->getUnitConfig($table_info['ParentPrefix'])->getItemType();
 			$object->SetDBField('ItemType', $source_item_type);
 		}
 
 	}
\ No newline at end of file
Index: branches/5.3.x/core/units/mailing_lists/mailing_list_tp.php
===================================================================
--- branches/5.3.x/core/units/mailing_lists/mailing_list_tp.php	(revision 16518)
+++ branches/5.3.x/core/units/mailing_lists/mailing_list_tp.php	(revision 16519)
@@ -1,63 +1,63 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class MailingListTagProcessor extends kDBTagProcessor {
 
 		function PrintRecipients($params)
 		{
+			/** @var kDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBItem */
 
+			/** @var MailingListHelper $mailing_list_helper */
 			$mailing_list_helper = $this->Application->recallObject('MailingListHelper');
-			/* @var $mailing_list_helper MailingListHelper */
 
 			// for each group convert ids to names
 			$recipient_names = Array ();
 			$recipients_grouped = $mailing_list_helper->groupRecipientsByType(explode(';', $object->GetDBField('To')));
 
 			foreach ($recipients_grouped as $recipient_type => $group_recipients) {
 				$recipient_names = array_merge($recipient_names, $mailing_list_helper->getRecipientNames($recipient_type, $group_recipients));
 			}
 
 			$ret = '';
 			$recipient_count = count($recipient_names);
 			$block_params = $this->prepareTagParams($params);
 			$block_params['name'] = $params['render_as'];
 
 			foreach ($recipient_names as $recipient_index => $recipient_name) {
 				$block_params['recipient_name'] = $recipient_name;
 				$block_params['not_last'] = $recipient_index < $recipient_count - 1;
 
 				$ret .= $this->Application->ParseBlock($block_params);
 			}
 
 			return $ret;
 		}
 
 		function IsManualRecipient($params)
 		{
 			$external_call = $this->Application->GetVar('mailing_recipient_type');
 
 			if ($external_call) {
 				return false;
 			}
 
+			/** @var kDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBItem */
 
 			return $object->IsNewItem();
 		}
 	}
\ No newline at end of file
Index: branches/5.3.x/core/units/mailing_lists/mailing_list_eh.php
===================================================================
--- branches/5.3.x/core/units/mailing_lists/mailing_list_eh.php	(revision 16518)
+++ branches/5.3.x/core/units/mailing_lists/mailing_list_eh.php	(revision 16519)
@@ -1,351 +1,351 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class MailingListEventHandler extends kDBEventHandler {
 
 		/**
 		 * Allows to override standard permission mapping
 		 *
 		 * @return void
 		 * @access protected
 		 * @see kEventHandler::$permMapping
 		 */
 		protected function mapPermissions()
 		{
 			parent::mapPermissions();
 
 			$permissions = Array (
 				'OnCancelMailing' => Array ('self' => 'edit'),
 				'OnGenerateEmailQueue' => Array ('self' => true),
 				'OnGetHtmlBody' => Array ('self' => 'edit'),
 			);
 
 			$this->permMapping = array_merge($this->permMapping, $permissions);
 		}
 
 		/**
 		 * Prepare recipient list
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnNew(kEvent $event)
 		{
 			parent::OnNew($event);
 
 			$recipient_type = $this->Application->GetVar('mailing_recipient_type');
 			if ( !$recipient_type ) {
 				return;
 			}
 
 			$recipients = $this->Application->GetVar($recipient_type);
 			if ( $recipients ) {
+				/** @var kDBItem $object */
 				$object = $event->getObject();
-				/* @var $object kDBItem */
 
 				$to = $recipient_type . '_' . implode(';' . $recipient_type . '_', array_keys($recipients));
 
 				$object->SetDBField('To', $to);
 			}
 
 			$this->setRequired($event);
 		}
 
 		/**
 		 * Prepare recipient list
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnPreCreate(kEvent $event)
 		{
 			parent::OnPreCreate($event);
 
 			$this->setRequired($event);
 		}
 
 		/**
 		 * Don't allow to delete mailings in progress
 		 *
 		 * @param kEvent $event
 		 * @param string $type
 		 * @return void
 		 * @access protected
 		 */
 		protected function customProcessing(kEvent $event, $type)
 		{
 			if ( $event->Name == 'OnMassDelete' && $type == 'before' ) {
 				$ids = $event->getEventParam('ids');
 
 				if ( $ids ) {
 					$config = $event->getUnitConfig();
 					$id_field = $config->getIDField();
 
 					$sql = 'SELECT ' . $id_field . '
 							FROM ' . $config->getTableName() . '
 							WHERE ' . $id_field . ' IN (' . implode(',', $ids) . ') AND Status <> ' . MailingList::PARTIALLY_PROCESSED;
 					$allowed_ids = $this->Conn->GetCol($sql);
 
 					$event->setEventParam('ids', $allowed_ids);
 				}
 			}
 		}
 
 		/**
 		 * Delete all related mails in email queue
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemDelete(kEvent $event)
 		{
 			parent::OnAfterItemDelete($event);
 
 			$this->_deleteQueue($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			// delete mailing attachments after mailing is deleted
 			$attachments = $object->GetField('Attachments', 'file_paths');
 			if ( $attachments ) {
 				$attachments = explode('|', $attachments);
 
 				foreach ($attachments as $attachment_file) {
 					if ( file_exists($attachment_file) ) {
 						unlink($attachment_file);
 					}
 				}
 			}
 		}
 
 		/**
 		 * Cancels given mailing and deletes all it's email queue
 		 *
 		 * @param kEvent $event
 		 */
 		function OnCancelMailing($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject( Array('skip_autoload' => true) );
-			/* @var $object kDBItem */
 
 			$ids = $this->StoreSelectedIDs($event);
 
 			if ($ids) {
 				foreach ($ids as $id) {
 					$object->Load($id);
 					$object->SetDBField('Status', MailingList::CANCELLED);
 					$object->Update();
 				}
 			}
 
 			$this->clearSelectedIDs($event);
 		}
 
 		/**
 		 * Checks, that at least one message text field is filled
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemCreate(kEvent $event)
 		{
 			parent::OnBeforeItemCreate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			if ( !$this->Application->GetVar('mailing_recipient_type') ) {
 				// user manually typed email addresses -> normalize
 				$recipients = str_replace(',', ';', $object->GetDBField('To'));
 				$recipients = array_map('trim', explode(';', $recipients));
 
 				$object->SetDBField('To', implode(';', $recipients));
 			}
 
 			// remember user, who created mailing, because of his name
 			// is needed for "From" field, but mailing occurs from cron
 			$user_id = $this->Application->RecallVar('user_id');
 			$object->SetDBField('PortalUserId', $user_id);
 
 			$this->setRequired($event);
 		}
 
 		/**
 		 * Checks, that at least one message text field is filled
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemUpdate(kEvent $event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
 			$this->setRequired($event);
 		}
 
 		/**
 		 * Dynamically changes required fields
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function setRequired(kEvent $event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$object->setRequired('MessageHtml', !$object->GetDBField('MessageText'));
 			$object->setRequired('MessageText', !$object->GetDBField('MessageHtml'));
 		}
 
 		/**
 		 * Deletes mailing list email queue, when it becomes cancelled
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemUpdate(kEvent $event)
 		{
 			parent::OnAfterItemUpdate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$status = $object->GetDBField('Status');
 			if ( ($status != $object->GetOriginalField('Status')) && ($status == MailingList::CANCELLED) ) {
 				$this->_deleteQueue($event);
 			}
 		}
 
 		/**
 		 * Deletes email queue records related with given mailing list
 		 *
 		 * @param kEvent $event
 		 */
 		function _deleteQueue($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$sql = 'DELETE FROM ' . $this->Application->getUnitConfig('email-queue')->getTableName() . '
 					WHERE MailingId = ' . $object->GetID();
 			$this->Conn->Query($sql);
 		}
 
 		/**
 		 * Generates email queue for active mailing lists
 		 *
 		 * @param kEvent $event
 		 */
 		function OnGenerateEmailQueue($event)
 		{
 			$config = $event->getUnitConfig();
 			$id_field = $config->getIDField();
 			$table_name = $config->getTableName();
 
 			$where_clause = Array (
 				'Status NOT IN (' . MailingList::CANCELLED . ',' . MailingList::PROCESSED . ')',
 				'(EmailsQueuedTotal < EmailsTotal) OR (EmailsTotal = 0)',
 				'`To` <> ""',
 			);
 
 			$sql = 'SELECT *
 					FROM ' . $table_name . '
 					WHERE (' . implode(') AND (', $where_clause) . ')
 					ORDER BY ' . $id_field . ' ASC';
 			$mailing_lists = $this->Conn->Query($sql, $id_field);
 
 			if ( !$mailing_lists ) {
 				return;
 			}
 
+			/** @var MailingListHelper $mailing_list_helper */
 			$mailing_list_helper = $this->Application->recallObject('MailingListHelper');
-			/* @var $mailing_list_helper MailingListHelper */
 
 			$to_queue = $mailing_list_helper->getSetting('MailingListQueuePerStep');
 
 			if ( !is_numeric($to_queue) ) {
 				return;
 			}
 
 			foreach ($mailing_lists as $mailing_id => $mailing_data) {
 				if ( $mailing_data['EmailsTotal'] == 0 ) {
 					// no work performed on this mailing list -> calculate totals
 					$updated_fields = $mailing_list_helper->generateRecipients($mailing_id, $mailing_data);
 					$updated_fields['Status'] = MailingList::PARTIALLY_PROCESSED;
 					$mailing_data = array_merge($mailing_data, $updated_fields);
 
 					$this->Conn->doUpdate($updated_fields, $table_name, $id_field . ' = ' . $mailing_id);
 				}
 
 				$emails = unserialize($mailing_data['ToParsed']);
 
 				if ( !$emails ) {
 					continue;
 				}
 
 				// queue allowed count of emails
 				$i = 0;
 				$process_count = count($emails) >= $to_queue ? $to_queue : count($emails);
 
 				while ($i < $process_count) {
 					$mailing_list_helper->queueEmail($emails[$i], $mailing_id, $mailing_data);
 					$i++;
 				}
 
 				// remove processed emails from array
 				$to_queue -= $process_count; // decrement available for processing email count
 				array_splice($emails, 0, $process_count);
 
 				$updated_fields = Array (
 					'ToParsed' => serialize($emails),
 					'EmailsQueuedTotal' => $mailing_data['EmailsQueuedTotal'] + $process_count,
 				);
 
 				$this->Conn->doUpdate($updated_fields, $table_name, $id_field . ' = ' . $mailing_id);
 
 				if ( !$to_queue ) {
 					// emails to be queued per step reached -> leave
 					break;
 				}
 			}
 		}
 
 		/**
 		 * Returns HTML of sent e-mail for iframe
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnGetHtmlBody(kEvent $event)
 		{
 			$event->status = kEvent::erSTOP;
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			echo '<html><body style="font-size: 14px;">' . $object->GetDBField('MessageHtml') . '</body></html>';
 		}
-	}
\ No newline at end of file
+	}
Index: branches/5.3.x/core/units/custom_fields/custom_fields_tag_processor.php
===================================================================
--- branches/5.3.x/core/units/custom_fields/custom_fields_tag_processor.php	(revision 16518)
+++ branches/5.3.x/core/units/custom_fields/custom_fields_tag_processor.php	(revision 16519)
@@ -1,164 +1,164 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class CustomFieldsTagProcessor extends kDBTagProcessor {
 
 		/**
 		 * Return LEFT JOINed custom field name from main item config
 		 *
 		 * @param Array $params
 		 * @return string
 		 */
 		function GetMainField($params)
 		{
 			$object = $this->getObject($params);
 			$append = isset($params['append']) && $params['append'] ? $params['append'] : '';
 			return 'cust_'.$object->GetDBField('FieldName').$append;
 		}
 
 		function CustomField($params)
 		{
 			$params['name'] = $this->GetMainField($params);
 			$source_prefix = $this->Application->Parser->GetParam('SourcePrefix');
 			return $this->Application->ProcessParsedTag($source_prefix, 'Field', $params);
 		}
 
 		function CustomFormat($params)
 		{
 			$params['name'] = $this->GetMainField($params);
 			$source_prefix = $this->Application->Parser->GetParam('SourcePrefix');
 			return $this->Application->ProcessParsedTag($source_prefix, 'Format', $params);
 		}
 
 		function CustomInputName($params)
 		{
 			$params['name'] = $this->GetMainField($params);
 			$source_prefix = $this->Application->Parser->GetParam('SourcePrefix');
 			return $this->Application->ProcessParsedTag($source_prefix, 'InputName', $params);
 		}
 
 		function setParamValue(&$params, $param_name)
 		{
 			// $deep_level if GetParam = 1 used in case if PrintList is called during parsing "grid" block (=> +1 to deep_level)
 			if (!isset($params[$param_name])) {
 				$params[$param_name] = $this->Application->Parser->GetParam($param_name, 1);
 			}
 
 			return $params[$param_name];
 		}
 
 		/**
 		 * Prints list content using block specified
 		 *
 		 * @param Array $params
 		 * @return string
 		 * @access public
 		 */
 		function PrintList($params)
 		{
 			$this->setParamValue($params, 'SourcePrefix');
 			$this->setParamValue($params, 'value_field');
 
 			$list =& $this->GetList($params);
 			$id_field = $this->getUnitConfig()->getIDField();
 
 			$list->Query();
 			$o = '';
 			$list->GoFirst();
 
 			$block_params = $this->prepareTagParams($params);
 			$block_params['name'] = $this->SelectParam($params, 'render_as,block');
 			$block_params['pass_params'] = 'true';
 
 			$prev_heading = '';
 			$display_original = false;
 			$source_prefix = getArrayValue($params, 'SourcePrefix');
 			$source_object = $original_object = null;
 
 			if ( $source_prefix ) {
 				$source_object = $this->Application->recallObject($source_prefix, null, Array ('raise_warnings' => 0)); // it's possible, that in some cases object will not be loaded
-				/* @var $source_object kCatDBItem */
+				/** @var kCatDBItem $source_object */
 
 				$display_original = $this->Application->ProcessParsedTag($source_prefix, 'DisplayOriginal', Array ('display_original' => $this->setParamValue($params, 'display_original')));
 			}
 
 			if ( $display_original ) {
 				$block_params['display_original'] = $display_original;
 				$block_params['original_title'] = $this->setParamValue($params, 'original_title');
 
 				$original_object = $this->Application->recallObject($source_prefix . '.original', null, Array ('raise_warnings' => 0)); // it's possible, that in some cases object will not be loaded
-				/* @var $original_object kCatDBItem */
+				/** @var kCatDBItem $original_object */
 			}
 
 			if ($this->Special == 'general') {
 				$list->groupRecords('Heading');
 			}
 
 			$i = 0;
 			while ( !$list->EOL() ) {
 				$block_params['is_last'] = ($i == $list->GetSelectedCount() - 1);
 				$block_params['not_last'] = !$block_params['is_last']; // for front-end
 
 				$this->Application->SetVar($this->getPrefixSpecial() . '_id', $list->GetDBField($id_field)); // for edit/delete links using GET
 
 				if ( $source_prefix ) {
 					$field_name = 'cust_' . $list->GetDBField('FieldName');
 
 					$formatter = $source_object->GetFieldOption($field_name, 'formatter');
 					$language_prefix = $formatter == 'kMultiLanguage' ? 'l' . $this->Application->GetVar('m_lang') . '_' : '';
 
 					$list->SetDBField($params['value_field'], $source_object->GetDBField($language_prefix . 'cust_' . $list->GetDBField('FieldName')));
 
 					if ( $display_original ) {
 						$list->SetDBField('OriginalValue', $original_object->GetField('cust_' . $list->GetDBField('FieldName')));
 					}
 
 					$block_params['field'] = $block_params['virtual_field'] = 'cust_' . $list->GetDBField('FieldName');
 					$block_params['show_heading'] = ($prev_heading != $list->GetDBField('Heading')) ? 1 : 0;
 
 					$list->SetDBField('DirectOptions', $source_object->GetFieldOption($field_name, 'options'));
 				}
 
 				$o .= $this->Application->ParseBlock($block_params);
 				$prev_heading = $list->GetDBField('Heading');
 				$list->GoNext();
 				$i++;
 			}
 
 			$this->Application->SetVar($this->getPrefixSpecial() . '_id', '');
 
 			return $o;
 		}
 
 		/**
 		 * If data was modfied & is in TempTables mode, then parse block with name passed;
 		 * remove modification mark if not in TempTables mode
 		 *
 		 * @param Array $params
 		 * @return string
 		 * @access public
 		 * @author Alexey
 		 */
 		function SaveWarning($params)
 		{
 			$source_prefix = array_key_exists('SourcePrefix', $params) ? $params['SourcePrefix'] : false;
 			if ($source_prefix && $source_prefix == 'c') {
 				return $this->Application->ProcessParsedTag('c', 'SaveWarning', $params);
 			}
 
 			return parent::SaveWarning($params);
 		}
 	}
\ No newline at end of file
Index: branches/5.3.x/core/units/custom_fields/custom_fields_event_handler.php
===================================================================
--- branches/5.3.x/core/units/custom_fields/custom_fields_event_handler.php	(revision 16518)
+++ branches/5.3.x/core/units/custom_fields/custom_fields_event_handler.php	(revision 16519)
@@ -1,352 +1,352 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class CustomFieldsEventHandler extends kDBEventHandler {
 
 		/**
 		 * Changes permission section to one from REQUEST, not from config
 		 *
 		 * @param kEvent $event
 		 * @return bool
 		 * @access public
 		 */
 		public function CheckPermission(kEvent $event)
 		{
 			$sql = 'SELECT Prefix
 					FROM ' . TABLE_PREFIX . 'ItemTypes
 					WHERE ItemType = ' . $this->Conn->qstr($this->Application->GetVar('cf_type'));
 			$main_prefix = $this->Conn->GetOne($sql);
 
 			$section = $this->Application->getUnitConfig($main_prefix)->getPermSectionByName('custom');
 			$event->setEventParam('PermSection', $section);
 
 			return parent::CheckPermission($event);
 		}
 
 		/**
 		 * Apply any custom changes to list's sql query
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
 		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			$item_type = $this->Application->GetVar('cf_type');
 
 			if ( !$item_type ) {
 				$prefix = $event->getEventParam('SourcePrefix');
 				$item_type = $this->Application->getUnitConfig($prefix)->getItemType();
 			}
 
 			if ( $event->Special == 'general' ) {
 				$object->addFilter('generaltab_filter', '%1$s.OnGeneralTab = 1');
 			}
 
 			if ( $item_type ) {
 				$hidden_fields = $this->Conn->qstrArray($this->_getHiddenFields($event));
 
 				if ( $hidden_fields ) {
 					$object->addFilter('hidden_filter', '%1$s.FieldName NOT IN (' . implode(',', $hidden_fields) . ')');
 				}
 
 				$object->addFilter('itemtype_filter', '%1$s.Type = ' . $item_type);
 			}
 
 			if ( !($this->Application->isDebugMode() && $this->Application->isAdminUser) ) {
 				$object->addFilter('user_filter', '%1$s.IsSystem = 0');
 			}
 		}
 
 		/**
 		 * Returns prefix, that custom fields are printed for
 		 *
 		 * @param kEvent $event
 		 * @return string
 		 */
 		function _getSourcePrefix($event)
 		{
 			$prefix = $event->getEventParam('SourcePrefix');
 
 			if ( !$prefix ) {
 				$sql = 'SELECT Prefix
 						FROM ' . TABLE_PREFIX . 'ItemTypes
 						WHERE ItemType = ' . $this->Conn->qstr($this->Application->GetVar('cf_type'));
 				$prefix = $this->Conn->GetOne($sql);
 			}
 
 			return $prefix;
 		}
 
 		/**
 		 * Get custom fields, that should no be shown anywhere
 		 *
 		 * @param kEvent $event
 		 * @return Array
 		 * @access protected
 		 */
 		protected function _getHiddenFields($event)
 		{
 			$hidden_fields = Array ();
 			$config = $this->Application->getUnitConfig($this->_getSourcePrefix($event));
 
 			foreach ($config->getCustomFields(Array ()) as $custom_field) {
 				$check_field = 'cust_' . $custom_field;
 
 				$field_options = $config->getVirtualFieldByName($check_field);
 				$show_mode = array_key_exists('show_mode', $field_options) ? $field_options['show_mode'] : true;
 
 				if ( ($show_mode === false) || (($show_mode === smDEBUG) && !(defined('DEBUG_MODE') && DEBUG_MODE)) ) {
 					$hidden_fields[] = $custom_field;
 				}
 			}
 
 			return $hidden_fields;
 		}
 
 		/**
 		 * Prevents from duplicate item creation
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemCreate(kEvent $event)
 		{
 			parent::OnBeforeItemCreate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$sql = 'SELECT COUNT(*)
 					FROM ' . $event->getUnitConfig()->getTableName() . '
 					WHERE FieldName = ' . $this->Conn->qstr($object->GetDBField('FieldName')) . ' AND Type = ' . $object->GetDBField('Type');
 			$found = $this->Conn->GetOne($sql);
 
 			if ( $found ) {
 				$event->status = kEvent::erFAIL;
 				$object->SetError('FieldName', 'duplicate', 'la_error_CustomExists');
 			}
 		}
 
 		/**
 		 * Occurs after deleting item, id of deleted item
 		 * is stored as 'id' param of event
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemDelete(kEvent $event)
 		{
 			parent::OnAfterItemDelete($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$main_prefix = $this->getPrefixByItemType($object->GetDBField('Type'));
 
+			/** @var kMultiLanguageHelper $ml_helper */
 			$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
-			/* @var $ml_helper kMultiLanguageHelper */
 
 			// call main item config to clone cdata table
 			$this->Application->getUnitConfig($main_prefix)->getTableName();
 			$ml_helper->deleteField($main_prefix . '-cdata', $event->getEventParam('id'));
 		}
 
 		/**
 		 * Get config prefix based on item type
 		 *
 		 * @param int $item_type
 		 * @return string
 		 * @access protected
 		 */
 		protected function getPrefixByItemType($item_type)
 		{
 			$sql = 'SELECT Prefix
 					FROM ' . TABLE_PREFIX . 'ItemTypes
 					WHERE ItemType = ' . $item_type;
 
 			return $this->Conn->GetOne($sql);
 		}
 
 		/**
 		 * Creates new database columns, once custom field is successfully created
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnSaveCustomField($event)
 		{
 			if ( $event->MasterEvent->status != kEvent::erSUCCESS ) {
 				return ;
 			}
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$main_prefix = $this->getPrefixByItemType($object->GetDBField('Type'));
 
+			/** @var kMultiLanguageHelper $ml_helper */
 			$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
-			/* @var $ml_helper kMultiLanguageHelper */
 
 			// call main item config to clone cdata table
 			define('CUSTOM_FIELD_ADDED', 1); // used in cdata::scanCustomFields method
 			$this->Application->getUnitConfig($main_prefix)->getTableName();
 			$ml_helper->createFields($main_prefix . '-cdata');
 		}
 
 		/**
 		 * Deletes all selected items.
 		 * Automatically recurse into sub-items using temp handler, and deletes sub-items
 		 * by calling its Delete method if sub-item has AutoDelete set to true in its config file
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnMassDelete(kEvent $event)
 		{
 			parent::OnMassDelete($event);
 
 			$event->SetRedirectParam('opener', 's');
 		}
 
 		/**
 		 * Prepare temp tables for creating new item
 		 * but does not create it. Actual create is
 		 * done in OnPreSaveCreated
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnPreCreate(kEvent $event)
 		{
 			parent::OnPreCreate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$object->SetDBField('Type', $this->Application->GetVar('cf_type'));
 		}
 
 		/**
 		 * Prepares ValueList field's value as xml for editing
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemLoad(kEvent $event)
 		{
 			parent::OnAfterItemLoad($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			if ( !in_array($object->GetDBField('ElementType'), $this->_getMultiElementTypes()) ) {
 				return ;
 			}
 
+			/** @var InpCustomFieldsHelper $custom_field_helper */
 			$custom_field_helper = $this->Application->recallObject('InpCustomFieldsHelper');
-			/* @var $custom_field_helper InpCustomFieldsHelper */
 
 			$options = $custom_field_helper->GetValuesHash($object->GetDBField('ValueList'), VALUE_LIST_SEPARATOR, false);
 
 			$records = Array ();
 
 			$option_key = key($options);
 			if ( $option_key === '' || $option_key == 0 ) {
 				// remove 1st empty option, and add it later, when options will be saved, but allow string option keys
 				unset($options[$option_key]); // keep index, don't use array_unshift!
 			}
 
 			foreach ($options as $option_key => $option_title) {
 				$records[] = Array ('OptionKey' => $option_key, 'OptionTitle' => $option_title);
 			}
 
+			/** @var MInputHelper $minput_helper */
 			$minput_helper = $this->Application->recallObject('MInputHelper');
-			/* @var $minput_helper MInputHelper */
 
 			$xml = $minput_helper->prepareMInputXML($records, Array ('OptionKey', 'OptionTitle'));
 			$object->SetDBField('Options', $xml);
 		}
 
 		/**
 		 * Returns custom field element types, that will use minput control
 		 *
 		 * @return Array
 		 * @access protected
 		 */
 		protected function _getMultiElementTypes()
 		{
 			return Array ('select', 'multiselect', 'radio');
 		}
 
 		/**
 		 * Saves minput content to ValueList field
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemUpdate(kEvent $event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			if ( !in_array($object->GetDBField('ElementType'), $this->_getMultiElementTypes()) ) {
 				return ;
 			}
 
+			/** @var MInputHelper $minput_helper */
 			$minput_helper = $this->Application->recallObject('MInputHelper');
-			/* @var $minput_helper MInputHelper */
 
 			$ret = $object->GetDBField('ElementType') == 'select' ? Array ('' => '=+') : Array ();
 			$records = $minput_helper->parseMInputXML($object->GetDBField('Options'));
 
 			if ( $object->GetDBField('SortValues') ) {
 				usort($records, Array (&$this, '_sortValues'));
 				ksort($records);
 			}
 
 			foreach ($records as $record) {
 				if ( substr($record['OptionKey'], 0, 3) == 'SQL' ) {
 					$ret[] = $record['OptionTitle'];
 				}
 				else {
 					$ret[] = $record['OptionKey'] . '=' . $record['OptionTitle'];
 				}
 			}
 
 			$object->SetDBField('ValueList', implode(VALUE_LIST_SEPARATOR, $ret));
 		}
 
 		function _sortValues($record_a, $record_b)
 		{
 			return strcasecmp($record_a['OptionTitle'], $record_b['OptionTitle']);
 		}
-	}
\ No newline at end of file
+	}
Index: branches/5.3.x/core/units/users/users_tag_processor.php
===================================================================
--- branches/5.3.x/core/units/users/users_tag_processor.php	(revision 16518)
+++ branches/5.3.x/core/units/users/users_tag_processor.php	(revision 16519)
@@ -1,378 +1,378 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class UsersTagProcessor extends kDBTagProcessor
 	{
 		function LogoutLink($params)
 		{
 			$pass = Array('pass' => 'all,m,u', 'u_event' => 'OnLogout', 'm_cat_id' => 0);
 			$logout_template = $this->SelectParam($params, 'template,t');
 			return $this->Application->HREF($logout_template, '', $pass);
 		}
 
 		function RegistrationEnabled($params)
 		{
 			return $this->Application->ConfigValue('User_Allow_New') != 2;
 		}
 
 		function SuggestRegister($params)
 		{
 			return !$this->Application->LoggedIn() && !$this->Application->ConfigValue('Comm_RequireLoginBeforeCheckout') && $this->RegistrationEnabled($params);
 		}
 
 		function ConfirmPasswordLink($params)
 		{
+			/** @var UsersItem $user */
 			$user = $this->Application->recallObject($this->Prefix . '.email-to');
-			/* @var $user UsersItem */
 
 			$code = $this->getCachedCode();
 			$user->SetDBField('PwResetConfirm', $code);
 			$user->SetDBField('PwRequestTime_date', time());
 			$user->SetDBField('PwRequestTime_time', time());
 
 			if ( $user->GetChangedFields() ) {
 				// tag is called 2 times within USER.PWDC email event, so don't update user record twice
 				$user->Update();
 			}
 
 		    $params['user_key'] = $code;
 
 		    if ( !$this->SelectParam($params, 'template,t') ) {
 		    	$params['template'] = $this->Application->GetVar('reset_confirm_template');
 		    }
 
 		    return $this->Application->ProcessParsedTag('m', 'Link', $params);
 		}
 
 		/**
 		 * Generates & caches code for password confirmation link
 		 *
 		 * @return string
 		 */
 		function getCachedCode()
 		{
 			static $code = null;
 
 			if ( !isset($code) ) {
 				$code = md5(kUtil::generateId());
 			}
 
 			return $code;
 		}
 
 		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;
 			$user_id = $user_helper->validateUserCode($this->Application->GetVar('user_key'), $code_type, $expiration_timeout);
 
 			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));
 
 				return false;
 			}
 
 			return true;
 		}
 
 		/**
 		 * Tries to restore user email
 		 *
 		 * @param Array $params
 		 * @return bool
 		 * @access protected
 		 */
 		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]);
 
 				return false;
 			}
 
 			return true;
 		}
 
 		/**
 		 * Returns error message set by given code type
 		 *
 		 * @param string $error_code
 		 * @param string $code_type
 		 * @param Array $params
 		 * @return string
 		 */
 		function _getUserCodeErrorMsg($error_code, $code_type, $params)
 		{
 			$error_messages = Array (
 				'forgot_password' => Array (
 					'code_is_not_valid' => 'lu_code_is_not_valid',
 					'code_expired' => 'lu_code_expired',
 				),
 
 				'activation' => Array (
 					'code_is_not_valid' => 'lu_error_ActivationCodeNotValid',
 					'code_expired' => 'lu_error_ActivationCodeExpired',
 				),
 
 				'verify_email' => Array (
 					'code_is_not_valid' => 'lu_error_VerificationCodeNotValid',
 					'code_expired' => 'lu_error_VerificationCodeExpired',
 				),
 			);
 
 			if ($code_type == 'custom') {
 				// custom error messages are given directly in tag
 				$error_messages[$code_type] = Array (
 					'code_is_not_valid' => $params['error_invalid'],
 					'code_expired' => $params['error_expired'],
 				);
 			}
 
 			return $error_messages[$code_type][$error_code];
 		}
 
 		/**
 		 * Returns site administrator email
 		 *
 		 * @param Array $params
 		 * @return string
 		 */
 		function SiteAdminEmail($params)
 		{
 			return $this->Application->ConfigValue('DefaultEmailSender');
 		}
 
 		/**
 		 * Returns login name of user
 		 *
 		 * @param Array $params
 		 * @return string
 		 * @access protected
 		 */
 		protected function LoginName($params)
 		{
+			/** @var UsersItem $object */
 			$object = $this->getObject($params);
-			/* @var $object UsersItem */
 
 			return $object->GetID() != USER_ROOT ? $object->GetDBField('Username') : 'root';
 		}
 
 		function CookieUsername($params)
 		{
 			$items_info = $this->Application->GetVar( $this->getPrefixSpecial(true) );
 
 			if ( $items_info !== false ) {
 				return $items_info[USER_GUEST][ $params['field'] ];
 			}
 
 			$username = $this->Application->GetVar('save_username'); // from cookie
 
 			if ($username == 'super-root') {
 				$username = 'root';
 			}
 
 			return $username === false ? '' : $username;
 		}
 
 		/**
 		 * Checks if user have one of required permissions
 		 *
 		 * @param Array $params
 		 * @return bool
 		 */
 		function HasPermission($params)
 		{
+			/** @var kPermissionsHelper $perm_helper */
 			$perm_helper = $this->Application->recallObject('PermissionsHelper');
-			/* @var $perm_helper kPermissionsHelper */
 
 			return $perm_helper->TagPermissionCheck($params);
 		}
 
 		/**
 		 * Returns link to user public profile
 		 *
 		 * @param Array $params
 		 * @return string
 		 */
 		function ProfileLink($params)
 		{
 			$object = $this->getObject($params);
 			$params['user_id'] = $object->GetID();
 
 			return $this->Application->ProcessParsedTag('m', 'Link', $params);
 		}
 
 		function ImageSrc($params)
 		{
 			list ($ret, $tag_processed) = $this->processAggregatedTag('ImageSrc', $params, $this->getPrefixSpecial());
 			return $tag_processed ? $ret : false;
 		}
 
 		function LoggedIn($params)
 		{
 			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);
 				$sql = 'SELECT LastAccessed, '.$object->IDField.'
 						FROM '.TABLE_PREFIX.'UserSessions
 						WHERE (PortalUserId IN ('.implode(',', $user_ids).'))';
 				$loggedin_status[$this->Special] = $this->Conn->GetCol($sql, $object->IDField);
 			}
 
 			return isset($loggedin_status[$this->Special][$object->GetID()]);
 		}
 
 		/**
 		 * Prints user activation link
 		 *
 		 * @param Array $params
 		 * @return string
 		 */
 		function ActivationLink($params)
 		{
+			/** @var kDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBItem */
 
 			$code = $this->getCachedCode();
 			$object->SetDBField('PwResetConfirm', $code);
 			$object->SetDBField('PwRequestTime_date', time());
 			$object->SetDBField('PwRequestTime_time', time());
 			$object->Update();
 
 		    $params['user_key'] = $code;
 
 		    return $this->Application->ProcessParsedTag('m', 'Link', $params);
 		}
 
 		/**
 		 * Returns link to revert e-mail change in user record
 		 *
 		 * @param Array $params
 		 * @return string
 		 * @access protected
 		 */
 		protected function UndoEmailChangeLink($params)
 		{
 			$params['hash'] = $this->Application->Parser->GetParam('hash');
 
 			if ( !$this->SelectParam($params, 'template,t') ) {
 				$params['template'] = $this->Application->GetVar('undo_email_template');
 			}
 
 			return $this->Application->ProcessParsedTag('m', 'Link', $params);
 		}
 
 		/**
 		 * Activates user using given code
 		 *
 		 * @param Array $params
 		 * @return string
 		 * @access protected
 		 */
 		protected function ActivateUser($params)
 		{
 			$this->_updateAndLogin(Array ('Status' => STATUS_ACTIVE, 'EmailVerified' => 1));
 
 			return '';
 		}
 
 		/**
 		 * Marks user e-mail as verified using given code
 		 *
 		 * @param Array $params
 		 * @return string
 		 * @access protected
 		 */
 		protected function MarkUserEmailAsVerified($params)
 		{
 			$this->_updateAndLogin(Array ('EmailVerified' => 1));
 
 			return '';
 		}
 
 		/**
 		 * Activates user using given code
 		 *
 		 * @param Array $fields_hash
 		 * @return void
 		 * @access protected
 		 */
 		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');
 
 			if ( !$user->isLoaded() ) {
 				return ;
 			}
 
 			$user->SetDBFieldsFromHash($fields_hash);
 			$user->SetDBField('PwResetConfirm', '');
 			$user->SetDBField('PwRequestTime_date', NULL);
 			$user->SetDBField('PwRequestTime_time', NULL);
 			$user->Update();
 
 			$login_user =& $user_helper->getUserObject();
 			$login_user->Load( $user->GetID() );
 
 			if ( ($login_user->GetDBField('Status') == STATUS_ACTIVE) && $user_helper->checkLoginPermission() ) {
 	    		$user_helper->loginUserById( $login_user->GetID() );
 			}
 		}
 
 		/**
 		 * Returns user title
 		 *
 		 * @param  array $params Parameters.
 		 * @return string
 		 * @access protected
 		 */
 		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');
 		}
 
 	}
Index: branches/5.3.x/core/units/users/users_event_handler.php
===================================================================
--- branches/5.3.x/core/units/users/users_event_handler.php	(revision 16518)
+++ branches/5.3.x/core/units/users/users_event_handler.php	(revision 16519)
@@ -1,1985 +1,1985 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class UsersEventHandler extends kDBEventHandler
 	{
 		/**
 		 * Allows to override standard permission mapping
 		 *
 		 * @return void
 		 * @access protected
 		 * @see kEventHandler::$permMapping
 		 */
 		protected function mapPermissions()
 		{
 			parent::mapPermissions();
 
 			$permissions = Array (
 				// admin
 				'OnSetPersistantVariable'	=>	Array('self' => 'view'), // because setting to logged in user only
 				'OnUpdatePassword'			=>	Array('self' => true),
 				'OnSaveSelected'			=>	Array ('self' => 'view'),
 				'OnGeneratePassword'			=>	Array ('self' => 'view'),
 
 				// front
 				'OnRefreshForm'				=>	Array('self' => true),
 
 				'OnForgotPassword'			=>	Array('self' => true),
 
 				'OnSubscribeQuery'			=>	Array('self' => true),
 				'OnSubscribeUser'			=>	Array('self' => true),
 
 				'OnRecommend'				=>	Array('self' => true),
 
 				'OnItemBuild'				=>	Array('self' => true),
 				'OnMassResetSettings'	=> Array('self' => 'edit'),
 				'OnMassCloneUsers'	=> Array('self' => 'add'),
 			);
 
 			$this->permMapping = array_merge($this->permMapping, $permissions);
 		}
 
 		/**
 		 * Builds item (loads if needed)
 		 *
 		 * Pattern: Prototype Manager
 		 *
 		 * @param kEvent $event
 		 * @access protected
 		 */
 		protected function OnItemBuild(kEvent $event)
 		{
 			parent::OnItemBuild($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			if ( $event->Special == 'forgot' || $object->getFormName() == 'registration' ) {
 				$this->_makePasswordRequired($event);
 			}
 		}
 
 		/**
 		 * Shows only admins when required
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
 		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			if ( $event->Special == 'regular' ) {
 				$object->addFilter('primary_filter', '%1$s.UserType = ' . UserType::USER);
 			}
 
 			if ( $event->Special == 'admins' ) {
 				$object->addFilter('primary_filter', '%1$s.UserType = ' . UserType::ADMIN);
 			}
 
 			if ( !$this->Application->isAdminUser ) {
 				$object->addFilter('status_filter', '%1$s.Status = ' . STATUS_ACTIVE);
 			}
 
 			if ( $event->Special == 'online' ) {
 				$object->addFilter('online_users_filter', 's.PortalUserId IS NOT NULL');
 			}
 
 			if ( $event->Special == 'group' ) {
 				$group_id = $this->Application->GetVar('g_id');
 
 				if ( $group_id !== false ) {
 					// show only users, that user doesn't belong to current group
 					$sql = 'SELECT PortalUserId
 							FROM ' . $this->Application->GetTempName(TABLE_PREFIX . 'UserGroupRelations', 'prefix:g') . '
 							WHERE GroupId = ' . (int)$group_id;
 					$user_ids = $this->Conn->GetCol($sql);
 
 					if ( $user_ids ) {
 						$object->addFilter('already_member_filter', '%1$s.PortalUserId NOT IN (' . implode(',', $user_ids) . ')');
 					}
 				}
 			}
 		}
 
 		/**
 		 * Checks user permission to execute given $event
 		 *
 		 * @param kEvent $event
 		 * @return bool
 		 * @access public
 		 */
 		public function CheckPermission(kEvent $event)
 		{
 			if ( $event->Name == 'OnLogin' || $event->Name == 'OnLoginAjax' || $event->Name == 'OnLogout' ) {
 				// permission is checked in OnLogin event directly
 				return true;
 			}
 
 			if ( $event->Name == 'OnResetRootPassword' ) {
 				return defined('DBG_RESET_ROOT') && DBG_RESET_ROOT;
 			}
 
 			if ( $event->Name == 'OnLoginAs' ) {
+				/** @var Session $admin_session */
 				$admin_session = $this->Application->recallObject('Session.admin');
-				/* @var $admin_session Session */
 
 				return $admin_session->LoggedIn();
 			}
 
 			if ( !$this->Application->isAdminUser ) {
 				$user_id = $this->Application->RecallVar('user_id');
 				$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
 
 				if ( ($event->Name == 'OnCreate' || $event->Name == 'OnRegisterAjax') && $user_id == USER_GUEST ) {
 					// "Guest" can create new users
 					return true;
 				}
 
 				if ( substr($event->Name, 0, 8) == 'OnUpdate' && $user_id > 0 ) {
+					/** @var UsersItem $user_dummy */
 					$user_dummy = $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true));
-					/* @var $user_dummy UsersItem */
 
 					foreach ($items_info as $id => $field_values) {
 						if ( $id != $user_id ) {
 							// registered users can update their record only
 							return false;
 						}
 
 						$user_dummy->Load($id);
 						$status_field = $event->getUnitConfig()->getStatusField(true);
 
 						if ( $user_dummy->GetDBField($status_field) != STATUS_ACTIVE ) {
 							// not active user is not allowed to update his record (he could not activate himself manually)
 							return false;
 						}
 
 						if ( isset($field_values[$status_field]) && $user_dummy->GetDBField($status_field) != $field_values[$status_field] ) {
 							// user can't change status by himself
 							return false;
 						}
 					}
 
 					return true;
 				}
 
 				if ( $event->Name == 'OnResetLostPassword' && $event->Special == 'forgot' && $user_id == USER_GUEST ) {
 					// non-logged in users can reset their password, when reset code is valid
 					return is_numeric($this->getPassedID($event));
 				}
 
 				if ( substr($event->Name, 0, 8) == 'OnUpdate' && $user_id <= 0 ) {
 					// guests are not allowed to update their record, because they don't have it :)
 					return false;
 				}
 			}
 
 			return parent::CheckPermission($event);
 		}
 
 		/**
 		 * Handles session expiration (redirects to valid template)
 		 *
 		 * @param kEvent $event
 		 */
 		function OnSessionExpire($event)
 		{
 			$this->Application->resetCounters('UserSessions');
 
 			// place 2 of 2 (also in kHTTPQuery::getRedirectParams)
 			$admin_url_params = Array (
 				'm_cat_id' => 0, // category means nothing on admin login screen
 				'm_wid' => '', // remove wid, otherwise parent window may add wid to its name breaking all the frameset (for <a> targets)
 				'pass' => 'm', // don't pass any other (except "m") prefixes to admin session expiration template
 				'expired' => 1, // expiration mark to show special error on login screen
 				'no_pass_through' => 1, // this way kApplication::HREF won't add them again
 			);
 
 			if ($this->Application->isAdmin) {
 				$this->Application->Redirect('index', $admin_url_params, '', 'index.php');
 			}
 
 			if ($this->Application->GetVar('admin') == 1) {
 				// Front-End showed in admin's right frame
+				/** @var Session $session_admin */
 				$session_admin = $this->Application->recallObject('Session.admin');
-				/* @var $session_admin Session */
 
 				if (!$session_admin->LoggedIn()) {
 					// front-end session created from admin session & both expired
 					$this->Application->DeleteVar('admin');
 					$this->Application->Redirect('index', $admin_url_params, '', 'admin/index.php');
 				}
 			}
 
 			// Front-End session expiration
 			$get = $this->Application->HttpQuery->getRedirectParams();
 			$t = $this->Application->GetVar('t');
 			$get['js_redirect'] = $this->Application->ConfigValue('UseJSRedirect');
 			$this->Application->Redirect($t ? $t : 'index', $get);
 		}
 
 		/**
 		 * [SCHEDULED TASK] Deletes expired sessions
 		 *
 		 * @param kEvent $event
 		 */
 		function OnDeleteExpiredSessions($event)
 		{
 			if (defined('IS_INSTALL') && IS_INSTALL) {
 				return ;
 			}
 
 			/** @var SessionStorage $session_storage */
 			$session_storage = $this->Application->recallObject('SessionStorage');
 			$session_storage->DeleteExpired();
 		}
 
 		/**
 		 * Checks user data and logs it in if allowed
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnLogin($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject( Array ('form_name' => 'login') );
-			/* @var $object kDBItem */
 
 			$object->SetFieldsFromHash($this->getSubmittedFields($event));
 			$username = $object->GetDBField('UserLogin');
 			$password = $object->GetDBField('UserPassword');
 			$remember_login = $object->GetDBField('UserRememberLogin') == 1;
 
-			/* @var $user_helper UserHelper */
+			/** @var UserHelper $user_helper */
 			$user_helper = $this->Application->recallObject('UserHelper');
 
 			$user_helper->event =& $event;
 			$result = $user_helper->loginUser($username, $password, false, $remember_login);
 
 			if ($result != LoginResult::OK) {
 				$event->status = kEvent::erFAIL;
 				$object->SetError('UserLogin', $result == LoginResult::NO_PERMISSION ? 'no_permission' : 'invalid_password');
 			}
 
 			if ( is_object($event->MasterEvent) && ($event->MasterEvent->Name == 'OnLoginAjax') ) {
 				// used to insert just logged-in user e-mail on "One Step Checkout" form in "Modern Store" theme
 				$user =& $user_helper->getUserObject();
 				$event->SetRedirectParam('user_email', $user->GetDBField('Email'));
 			}
 		}
 
 		/**
 		 * Performs user login from ajax request
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnLoginAjax($event)
 		{
+			/** @var AjaxFormHelper $ajax_form_helper */
 			$ajax_form_helper = $this->Application->recallObject('AjaxFormHelper');
-			/* @var $ajax_form_helper AjaxFormHelper */
 
 			$ajax_form_helper->transitEvent($event, 'OnLogin');
 		}
 
 		/**
 		 * [HOOK] Auto-Logins Front-End user when "Remember Login" cookie is found
 		 *
 		 * @param kEvent $event
 		 */
 		function OnAutoLoginUser($event)
 		{
 			$remember_login_cookie = $this->Application->GetVar('remember_login');
 
 			if (!$remember_login_cookie || $this->Application->isAdmin || $this->Application->LoggedIn()) {
 				return ;
 			}
 
-			/* @var $user_helper UserHelper */
+			/** @var UserHelper $user_helper */
 			$user_helper = $this->Application->recallObject('UserHelper');
 
 			$user_helper->loginUser('', '', false, false, $remember_login_cookie);
 		}
 
 		/**
 		 * Called when user logs in using old in-portal
 		 *
 		 * @param kEvent $event
 		 */
 		function OnInpLogin($event)
 		{
+			/** @var UsersSyncronizeManager $sync_manager */
 			$sync_manager = $this->Application->recallObject('UsersSyncronizeManager', null, Array(), Array ('InPortalSyncronize'));
-			/* @var $sync_manager UsersSyncronizeManager */
 
 			$sync_manager->performAction('LoginUser', $event->getEventParam('user'), $event->getEventParam('pass') );
 
 			if ($event->redirect && is_string($event->redirect)) {
 				// some real template specified instead of true
 				$this->Application->Redirect($event->redirect, $event->getRedirectParams());
 			}
 		}
 
 		/**
 		 * Called when user logs in using old in-portal
 		 *
 		 * @param kEvent $event
 		 */
 		function OnInpLogout($event)
 		{
+			/** @var UsersSyncronizeManager $sync_manager */
 			$sync_manager = $this->Application->recallObject('UsersSyncronizeManager', null, Array(), Array ('InPortalSyncronize'));
-			/* @var $sync_manager UsersSyncronizeManager */
 
 			$sync_manager->performAction('LogoutUser');
 		}
 
 		/**
 		 * Performs user logout
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnLogout($event)
 		{
-			/* @var $user_helper UserHelper */
+			/** @var UserHelper $user_helper */
 			$user_helper = $this->Application->recallObject('UserHelper');
 
 			$user_helper->event =& $event;
 			$user_helper->logoutUser();
 		}
 
 		/**
 		 * Redirects user after successful registration to confirmation template (on Front only)
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemCreate(kEvent $event)
 		{
 			parent::OnAfterItemCreate($event);
 
 			$this->afterItemChanged($event);
 
 			$this->assignToPrimaryGroup($event);
 		}
 
 		/**
 		 * Performs user registration
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnCreate(kEvent $event)
 		{
 			if ( $this->Application->isAdmin ) {
 				parent::OnCreate($event);
 
 				return ;
 			}
 
+			/** @var UsersItem $object */
 			$object = $event->getObject( Array('form_name' => 'registration') );
-			/* @var $object UsersItem */
 
 			$field_values = $this->getSubmittedFields($event);
 			$user_email = getArrayValue($field_values, 'Email');
 			$subscriber_id = $user_email ? $this->getSubscriberByEmail($user_email) : false;
 
 			if ( $subscriber_id ) {
 				// update existing subscriber
 				$object->Load($subscriber_id);
 				$object->SetDBField('PrimaryGroupId', $this->Application->ConfigValue('User_NewGroup'));
 				$this->Application->SetVar($event->getPrefixSpecial(true), Array ($object->GetID() => $field_values));
 			}
 
 			$object->SetFieldsFromHash($field_values);
 			$event->setEventParam('form_data', $field_values);
 
 			$status = $object->isLoaded() ? $object->Update() : $object->Create();
 
 			if ( !$status ) {
 				$event->status = kEvent::erFAIL;
 				$event->redirect = false;
 				$object->setID( (int)$object->GetID() );
 			}
 
 			$this->setNextTemplate($event, true);
 
 			if ( ($event->status == kEvent::erSUCCESS) && $event->redirect ) {
 				$this->assignToPrimaryGroup($event);
 
 				$object->sendEmails();
 				$this->autoLoginUser($event);
 			}
 		}
 
 		/**
 		 * Processes user registration from ajax request
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnRegisterAjax(kEvent $event)
 		{
+			/** @var AjaxFormHelper $ajax_form_helper */
 			$ajax_form_helper = $this->Application->recallObject('AjaxFormHelper');
-			/* @var $ajax_form_helper AjaxFormHelper */
 
 			$ajax_form_helper->transitEvent($event, 'OnCreate', Array ('do_refresh' => 1));
 		}
 
 		/**
 		 * Returns subscribed user ID by given e-mail address
 		 *
 		 * @param string $email
 		 * @return int|bool
 		 * @access protected
 		 */
 		protected function getSubscriberByEmail($email)
 		{
+			/** @var UsersItem $verify_user */
 			$verify_user = $this->Application->recallObject('u.verify', null, Array ('skip_autoload' => true));
-			/* @var $verify_user UsersItem */
 
 			$verify_user->Load($email, 'Email');
 
 			return $verify_user->isLoaded() && $verify_user->isSubscriberOnly() ? $verify_user->GetID() : false;
 		}
 
 		/**
 		 * Login user if possible, if not then redirect to corresponding template
 		 *
 		 * @param kEvent $event
 		 */
 		function autoLoginUser($event)
 		{
+			/** @var UsersItem $object */
 			$object = $event->getObject();
-			/* @var $object UsersItem */
 
 			if ( $object->GetDBField('Status') == STATUS_ACTIVE ) {
-				/* @var $user_helper UserHelper */
+				/** @var UserHelper $user_helper */
 				$user_helper = $this->Application->recallObject('UserHelper');
 
 				$user =& $user_helper->getUserObject();
 				$user->Load($object->GetID());
 
 				if ( $user_helper->checkLoginPermission() ) {
 					$user_helper->loginUserById( $user->GetID() );
 				}
 			}
 		}
 
 		/**
 		 * Set's new unique resource id to user
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemCreate(kEvent $event)
 		{
 			parent::OnBeforeItemCreate($event);
 
 			$this->beforeItemChanged($event);
 
+			/** @var kCountryStatesHelper $cs_helper */
 			$cs_helper = $this->Application->recallObject('CountryStatesHelper');
-			/* @var $cs_helper kCountryStatesHelper */
 
+			/** @var UsersItem $object */
 			$object = $event->getObject();
-			/* @var $object UsersItem */
 
 			if ( !$object->isSubscriberOnly() ) {
 				// don't check state-to-country relations for subscribers
 				$cs_helper->CheckStateField($event, 'State', 'Country');
 			}
 
 			if ( $object->getFormName() != 'login' ) {
 				$this->_makePasswordRequired($event);
 			}
 
 			$cs_helper->PopulateStates($event, 'State', 'Country');
 
 			$this->setUserGroup($object);
 
-			/* @var $user_helper UserHelper */
+			/** @var UserHelper $user_helper */
 			$user_helper = $this->Application->recallObject('UserHelper');
 
 			if ( !$user_helper->checkBanRules($object) ) {
 				$object->SetError('Username', 'banned');
 			}
 
 			$object->SetDBField('IPAddress', $this->Application->getClientIp());
 
 			if ( !$this->Application->isAdmin ) {
 				$object->SetDBField('FrontLanguage', $this->Application->GetVar('m_lang'));
 			}
 		}
 
 		/**
 		 * Sets primary group of the user
 		 *
 		 * @param kDBItem $object
 		 */
 		protected function setUserGroup(&$object)
 		{
 			if ($object->Special == 'subscriber') {
 				$object->SetDBField('PrimaryGroupId', $this->Application->ConfigValue('User_SubscriberGroup'));
 
 				return ;
 			}
 
 			// set primary group to user
 			if ( !$this->Application->isAdminUser ) {
 				$group_id = $object->GetDBField('PrimaryGroupId');
 
 				if ($group_id) {
 					// check, that group is allowed for Front-End
 					$sql = 'SELECT GroupId
 							FROM ' . TABLE_PREFIX . 'UserGroups
 							WHERE GroupId = ' . (int)$group_id . ' AND FrontRegistration = 1';
 					$group_id = $this->Conn->GetOne($sql);
 				}
 
 				if (!$group_id) {
 					// when group not selected OR not allowed -> use default group
 					$object->SetDBField('PrimaryGroupId', $this->Application->ConfigValue('User_NewGroup'));
 				}
 			}
 		}
 
 		/**
 		 * Assigns a user to it's primary group
 		 *
 		 * @param kEvent $event
 		 */
 		protected function assignToPrimaryGroup($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$primary_group_id = $object->GetDBField('PrimaryGroupId');
 
 			if ($primary_group_id) {
 				$ug_table = TABLE_PREFIX . 'UserGroupRelations';
 
 				if ( $object->IsTempTable() ) {
 					$ug_table = $this->Application->GetTempName($ug_table, 'prefix:' . $event->Prefix);
 				}
 
 				$sql = 'SELECT COUNT(*)
 						FROM ' . $ug_table . '
 						WHERE PortalUserId = ' . $object->GetID() . ' AND GroupId = ' . $primary_group_id;
 
 				if ( $this->Conn->GetOne($sql) ) {
 					return;
 				}
 
 				$fields_hash = Array (
 					'PortalUserId' => $object->GetID(),
 					'GroupId' => $primary_group_id,
 				);
 
 				if ( $object->IsTempTable() ) {
 					$new_id = (int)$this->Conn->GetOne('SELECT MIN(Id) FROM ' . $ug_table .' WHERE Id < 0' );
 					$fields_hash['Id'] = $new_id - 1;
 				}
 
 				$this->Conn->doInsert($fields_hash, $ug_table);
 			}
 		}
 
 		/**
 		 * Set's new unique resource id to user
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemValidate(kEvent $event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$resource_id = $object->GetDBField('ResourceId');
 
 			if ( !$resource_id ) {
 				$object->SetDBField('ResourceId', $this->Application->NextResourceId());
 			}
 		}
 
 		/**
 		 * Enter description here...
 		 *
 		 * @param kEvent $event
 		 */
 		function OnRecommend($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject( Array ('form_name' => 'recommend') );
-			/* @var $object kDBItem */
 
 			$object->SetFieldsFromHash($this->getSubmittedFields($event));
 
 			if ( !$object->ValidateField('RecommendEmail') ) {
 				$event->status = kEvent::erFAIL;
 
 				return ;
 			}
 
 	    	$send_params = Array (
 		    	'to_email' => $object->GetDBField('RecommendEmail'),
 				'to_name' => $object->GetDBField('RecommendEmail'),
 	    	);
 
 			$user_id = $this->Application->RecallVar('user_id');
 			$email_sent = $this->Application->emailUser('USER.SUGGEST', $user_id, $object->getEmailParams($send_params));
 			$this->Application->emailAdmin('USER.SUGGEST', null, $object->getEmailParams());
 
 			if ( $email_sent ) {
 				$event->SetRedirectParam('pass', 'all');
 				$event->redirect = $this->Application->GetVar('template_success');
 			}
 			else {
 				$event->status = kEvent::erFAIL;
 				$object->SetError('RecommendEmail', 'send_error');
 			}
 		}
 
 		/**
 		 * Saves address changes and mades no redirect
 		 *
 		 * @param kEvent $event
 		 */
 		function OnUpdateAddress($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject(Array ('skip_autoload' => true));
-			/* @var $object kDBItem */
 
 			$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
 
 			if ( $items_info ) {
 				list ($id, $field_values) = each($items_info);
 
 				if ( $id > 0 ) {
 					$object->Load($id);
 				}
 
 				$object->setID($id);
 				$object->SetFieldsFromHash($field_values);
 				$event->setEventParam('form_data', $field_values);
 
 				$object->Validate();
 			}
 
+			/** @var kCountryStatesHelper $cs_helper */
 			$cs_helper = $this->Application->recallObject('CountryStatesHelper');
-			/* @var $cs_helper kCountryStatesHelper */
 
 			$cs_helper->PopulateStates($event, 'State', 'Country');
 
 			$event->redirect = false;
 		}
 
 		/**
 		 * Validate subscriber's email & store it to session -> redirect to confirmation template
 		 *
 		 * @param kEvent $event
 		 */
 		function OnSubscribeQuery($event)
 		{
+			/** @var UsersItem $object */
 			$object = $event->getObject( Array ('form_name' => 'subscription') );
-			/* @var $object UsersItem */
 
 			$object->SetFieldsFromHash($this->getSubmittedFields($event));
 
 			if ( !$object->ValidateField('SubscriberEmail') ) {
 				$event->status = kEvent::erFAIL;
 
 				return ;
 			}
 
 			$user_email = $object->GetDBField('SubscriberEmail');
 			$object->Load($user_email, 'Email');
 			$event->SetRedirectParam('subscriber_email', $user_email);
 
 			if ( $object->isLoaded() && $object->isSubscribed() ) {
 				$event->redirect = $this->Application->GetVar('unsubscribe_template');
 			}
 			else {
 				$event->redirect = $this->Application->GetVar('subscribe_template');
 			}
 
 			$event->SetRedirectParam('pass', 'm');
 		}
 
 		/**
 		 * Subscribe/Unsubscribe user based on email stored in previous step
 		 *
 		 * @param kEvent $event
 		 */
 		function OnSubscribeUser($event)
 		{
+			/** @var UsersItem $object */
 			$object = $event->getObject( Array ('form_name' => 'subscription') );
-			/* @var $object UsersItem */
 
 			$user_email = $this->Application->GetVar('subscriber_email');
 			$object->SetDBField('SubscriberEmail', $user_email);
 
 			if ( !$object->ValidateField('SubscriberEmail') ) {
 				$event->status = kEvent::erFAIL;
 
 				return ;
 			}
 
 			$username_required = $object->isRequired('Username');
 			$this->RemoveRequiredFields($object);
 			$object->Load($user_email, 'Email');
 
 			if ( $object->isLoaded() ) {
 				if ( $object->isSubscribed() ) {
 					if ( $event->getEventParam('no_unsubscribe') ) {
 						// for customization code from FormsEventHandler
 						return ;
 					}
 
 					if ( $object->isSubscriberOnly() ) {
+						/** @var kTempTablesHandler $temp_handler */
 						$temp_handler = $this->Application->recallObject($event->Prefix . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
-						/* @var $temp_handler kTempTablesHandler */
 
 						$temp_handler->DeleteItems($event->Prefix, '', Array($object->GetID()));
 					}
 					else {
 						$this->RemoveSubscriberGroup( $object->GetID() );
 					}
 
 					$event->redirect = $this->Application->GetVar('unsubscribe_ok_template');
 				}
 				else {
 					$this->AddSubscriberGroup($object);
 					$event->redirect = $this->Application->GetVar('subscribe_ok_template');
 				}
 			}
 			else {
 				$object->generatePassword();
 				$object->SetDBField('Email', $user_email);
 
 				if ( $username_required )	{
 					$object->SetDBField('Username', str_replace('@', '_at_', $user_email));
 				}
 
 				$object->SetDBField('Status', STATUS_ACTIVE); // make user subscriber Active by default
 
 				if ( $object->Create() ) {
 					$this->AddSubscriberGroup($object);
 					$event->redirect = $this->Application->GetVar('subscribe_ok_template');
 				}
 			}
 		}
 
 		/**
 		 * Adding user to subscribers group
 		 *
 		 * @param UsersItem $object
 		 */
 		function AddSubscriberGroup(&$object)
 		{
 			if ( !$object->isSubscriberOnly() ) {
 				$fields_hash = Array (
 					'PortalUserId' => $object->GetID(),
 					'GroupId' => $this->Application->ConfigValue('User_SubscriberGroup'),
 				);
 
 				$this->Conn->doInsert($fields_hash, TABLE_PREFIX . 'UserGroupRelations');
 			}
 
 			$send_params = $object->getEmailParams();
 			$this->Application->emailUser('USER.SUBSCRIBE', $object->GetID(), $send_params);
 			$this->Application->emailAdmin('USER.SUBSCRIBE', null, $send_params);
 		}
 
 		/**
 		 * Removing user from subscribers group
 		 *
 		 * @param int $user_id
 		 */
 		function RemoveSubscriberGroup($user_id)
 		{
 			$group_id = $this->Application->ConfigValue('User_SubscriberGroup');
 
 			$sql = 'DELETE FROM ' . TABLE_PREFIX . 'UserGroupRelations
 					WHERE PortalUserId = ' . $user_id . ' AND GroupId = ' . $group_id;
 			$this->Conn->Query($sql);
 
 			$send_params = Array (
 				'PrefixSpecial' => 'u',
 				'item_id' => $user_id
 			);
 
 			$this->Application->emailUser('USER.UNSUBSCRIBE', $user_id, $send_params);
 			$this->Application->emailAdmin('USER.UNSUBSCRIBE', null, $send_params);
 		}
 
 		/**
 		 * Validates forgot password form and sends password reset confirmation e-mail
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 */
 		function OnForgotPassword($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject( Array ('form_name' => 'forgot_password') );
-			/* @var $object kDBItem */
 
 			$object->SetFieldsFromHash($this->getSubmittedFields($event));
 
+			/** @var UsersItem $user */
 			$user = $this->Application->recallObject('u.tmp', null, Array ('skip_autoload' => true));
-			/* @var $user UsersItem */
 
 			$found = $allow_reset = false;
 			$email_or_username = $object->GetDBField('ForgotLogin');
 			$is_email = strpos($email_or_username, '@') !== false;
 
 			if ( strlen($email_or_username) ) {
 				$user->Load($email_or_username, $is_email ? 'Email' : 'Username');
 			}
 
 			if ( $user->isLoaded() ) {
 				$min_pwd_reset_delay = $this->Application->ConfigValue('Users_AllowReset');
 				$found = ($user->GetDBField('Status') == STATUS_ACTIVE) && strlen($user->GetDBField('Password'));
 
 				if ( !$user->GetDBField('PwResetConfirm') ) {
 					// no reset made -> allow
 					$allow_reset = true;
 				}
 				else {
 					// reset made -> wait N minutes, then allow
 					$allow_reset = TIMENOW > $user->GetDBField('PwRequestTime') + $min_pwd_reset_delay;
 				}
 			}
 
 			if ($found && $allow_reset) {
 				$this->Application->emailUser('USER.PSWDC', $user->GetID(), $user->getEmailParams());
 				$event->redirect = $this->Application->GetVar('template_success');
 
 				return ;
 			}
 
 			if ( strlen($email_or_username) ) {
 				$object->SetError('ForgotLogin', $found ? 'reset_denied' : ($is_email ? 'unknown_email' : 'unknown_username'));
 			}
 
 			if ( !$object->ValidateField('ForgotLogin') ) {
 				$event->status = kEvent::erFAIL;
 			}
 		}
 
 		/**
 		 * Updates kDBItem
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnUpdate(kEvent $event)
 		{
 			parent::OnUpdate($event);
 
 			if ( !$this->Application->isAdmin ) {
 				$this->setNextTemplate($event);
 			}
 		}
 
 		/**
 		 * Updates kDBItem via AJAX.
 		 *
 		 * @param kEvent $event Event.
 		 *
 		 * @return void
 		 */
 		protected function OnUpdateAjax(kEvent $event)
 		{
 			/** @var AjaxFormHelper $ajax_form_helper */
 			$ajax_form_helper = $this->Application->recallObject('AjaxFormHelper');
 			$ajax_form_helper->transitEvent($event, 'OnUpdate');
 		}
 
 		/**
 		 * Checks state against country
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemUpdate(kEvent $event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
 			$this->beforeItemChanged($event);
 
+			/** @var kCountryStatesHelper $cs_helper */
 			$cs_helper = $this->Application->recallObject('CountryStatesHelper');
-			/* @var $cs_helper kCountryStatesHelper */
 
 			$cs_helper->CheckStateField($event, 'State', 'Country');
 			$cs_helper->PopulateStates($event, 'State', 'Country');
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			if ( $event->Special == 'forgot' ) {
 				$object->SetDBField('PwResetConfirm', '');
 				$object->SetDBField('PwRequestTime_date', NULL);
 				$object->SetDBField('PwRequestTime_time', NULL);
 			}
 
 			$changed_fields = array_keys($object->GetChangedFields());
 
 			if ( $changed_fields && !in_array('Modified', $changed_fields) ) {
 				$object->SetDBField('Modified_date', time());
 				$object->SetDBField('Modified_time', time());
 			}
 
 			if ( !$this->Application->isAdmin && in_array('Email', $changed_fields) && ($event->Special != 'email-restore') ) {
 				$object->SetDBField('EmailVerified', 0);
 			}
 		}
 
 		/**
 		 * Occurs before item is changed
 		 *
 		 * @param kEvent $event
 		 */
 		function beforeItemChanged($event)
 		{
+			/** @var UsersItem $object */
 			$object = $event->getObject();
-			/* @var $object UsersItem */
 
 			if ( !$this->Application->isAdmin && $object->getFormName() == 'registration' ) {
 				// sets new user's status based on config options
 				$status_map = Array (1 => STATUS_ACTIVE, 2 => STATUS_DISABLED, 3 => STATUS_PENDING, 4 => STATUS_PENDING);
 				$object->SetDBField('Status', $status_map[ $this->Application->ConfigValue('User_Allow_New') ]);
 
 				if ( $this->Application->ConfigValue('User_Password_Auto') ) {
 					$object->generatePassword( rand(5, 8) );
 				}
 
 				if ( $this->Application->ConfigValue('RegistrationCaptcha') ) {
+					/** @var kCaptchaHelper $captcha_helper */
 					$captcha_helper = $this->Application->recallObject('CaptchaHelper');
-					/* @var $captcha_helper kCaptchaHelper */
 
 					$captcha_helper->validateCode($event, false);
 				}
 
 				if ( $event->Name == 'OnBeforeItemUpdate' ) {
 					// when a subscriber-only users performs normal registration, then assign him to Member group
 					$this->setUserGroup($object);
 				}
 			}
 		}
 
 		/**
 		 * Sets redirect template based on user status & user request contents
 		 *
 		 * @param kEvent $event
 		 * @param bool $for_registration
 		 */
 		function setNextTemplate($event, $for_registration = false)
 		{
 			$event->SetRedirectParam('opener', 's');
 
+			/** @var UsersItem $object */
 			$object = $event->getObject();
-			/* @var $object UsersItem */
 
 			$next_template = false;
 
 			if ( $object->GetDBField('Status') == STATUS_ACTIVE && $this->Application->GetVar('next_template') ) {
 				$next_template = $this->Application->GetVar('next_template');
 			}
 			elseif ( $for_registration ) {
 				switch ( $this->Application->ConfigValue('User_Allow_New') ) {
 					case 1: // Immediate
 						$next_template = $this->Application->GetVar('registration_confirm_template');
 						break;
 
 					case 3: // Upon Approval
 					case 4: // Email Activation
 						$next_template = $this->Application->GetVar('registration_confirm_pending_template');
 						break;
 				}
 			}
 
 			if ($next_template) {
 				$event->redirect = $next_template;
 			}
 		}
 
 		/**
 		 * Delete users from groups if their membership is expired
 		 *
 		 * @param kEvent $event
 		 */
 		function OnCheckExpiredMembership($event)
 		{
 			// send pre-expiration reminders: begin
 			$pre_expiration = time() + $this->Application->ConfigValue('User_MembershipExpirationReminder') * 3600 * 24;
 			$sql = 'SELECT PortalUserId, GroupId
 					FROM '.TABLE_PREFIX.'UserGroupRelations
 					WHERE (MembershipExpires IS NOT NULL) AND (ExpirationReminderSent = 0) AND (MembershipExpires < '.$pre_expiration.')';
 
 			$skip_clause = $event->getEventParam('skip_clause');
 			if ($skip_clause) {
 				$sql .= ' AND !('.implode(') AND !(', $skip_clause).')';
 			}
 
 			$records = $this->Conn->Query($sql);
 			if ($records) {
 				$conditions = Array();
 
 				/** @var UsersItem $user */
 				$user = $this->Application->recallObject('u', null, array('skip_autoload' => true));
 
 				foreach ($records as $record) {
 					$user->Load($record['PortalUserId']);
 
 					$this->Application->emailUser(
 						'USER.MEMBERSHIP.EXPIRATION.NOTICE',
 						$record['PortalUserId'],
 						$user->getEmailParams()
 					);
 					$this->Application->emailAdmin('USER.MEMBERSHIP.EXPIRATION.NOTICE', null, $user->getEmailParams());
 					$conditions[] = '(PortalUserId = '.$record['PortalUserId'].' AND GroupId = '.$record['GroupId'].')';
 				}
 
 				$sql = 'UPDATE '.TABLE_PREFIX.'UserGroupRelations
 						SET ExpirationReminderSent = 1
 						WHERE '.implode(' OR ', $conditions);
 				$this->Conn->Query($sql);
 			}
 			// send pre-expiration reminders: end
 
 			// remove users from groups with expired membership: begin
 			$sql = 'SELECT PortalUserId
 					FROM '.TABLE_PREFIX.'UserGroupRelations
 					WHERE (MembershipExpires IS NOT NULL) AND (MembershipExpires < '.time().')';
 			$user_ids = $this->Conn->GetCol($sql);
 			if ($user_ids) {
 				/** @var UsersItem $user */
 				$user = $this->Application->recallObject('u', null, array('skip_autoload' => true));
 
 				foreach ($user_ids as $id) {
 					$user->Load($id);
 
 					$this->Application->emailUser('USER.MEMBERSHIP.EXPIRED', $id, $user->getEmailParams());
 					$this->Application->emailAdmin('USER.MEMBERSHIP.EXPIRED', null, $user->getEmailParams());
 				}
 			}
 			$sql = 'DELETE FROM '.TABLE_PREFIX.'UserGroupRelations
 					WHERE (MembershipExpires IS NOT NULL) AND (MembershipExpires < '.time().')';
 			$this->Conn->Query($sql);
 			// remove users from groups with expired membership: end
 		}
 
 		/**
 		 * Used to keep user registration form data, while showing affiliate registration form fields
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnRefreshForm($event)
 		{
 			$event->redirect = false;
 			$item_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
 			list($id, $field_values) = each($item_info);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject( Array ('skip_autoload' => true) );
-			/* @var $object kDBItem */
 
 			$object->IgnoreValidation = true;
 
 			$object->setID($id);
 			$object->SetFieldsFromHash($field_values);
 			$event->setEventParam('form_data', $field_values);
 		}
 
 		/**
 		 * Sets persistant variable
 		 *
 		 * @param kEvent $event
 		 */
 		function OnSetPersistantVariable($event)
 		{
 			$field =  $this->Application->GetVar('field');
 			$value = $this->Application->GetVar('value');
 			$this->Application->StorePersistentVar($field, $value);
 
 			$force_tab = $this->Application->GetVar('SetTab');
 			if ($force_tab) {
 				$this->Application->StoreVar('force_tab', $force_tab);
 			}
 		}
 
 		/**
 		 * Return user from order by special .ord
 		 *
 		 * @param kEvent $event
 		 * @return int
 		 * @access public
 		 */
 		public function getPassedID(kEvent $event)
 		{
 			switch ($event->Special) {
 				case 'ord':
+					/** @var OrdersItem $order */
 					$order = $this->Application->recallObject('ord');
-					/* @var $order OrdersItem */
 
 					return $order->GetDBField('PortalUserId');
 					break;
 
 				case 'profile':
 					$id = $this->Application->GetVar('user_id');
 
 					if ( $id ) {
 						$event->setEventParam(kEvent::FLAG_ID_FROM_REQUEST, true);
 
 						return $id;
 					}
 
 					// If none user_id given use current user id.
 					return $this->Application->RecallVar('user_id');
 					break;
 
 				case 'forgot':
-					/* @var $user_helper UserHelper */
+					/** @var UserHelper $user_helper */
 					$user_helper = $this->Application->recallObject('UserHelper');
 
 					$id = $user_helper->validateUserCode($this->Application->GetVar('user_key'), 'forgot_password');
 
 					if ( is_numeric($id) ) {
 						return $id;
 					}
 					break;
 			}
 
 			if ( preg_match('/^(login|register|recommend|subscribe|forgot)/', $event->Special) ) {
 				// this way we can have 2+ objects stating with same special, e.g. "u.login-sidebox" and "u.login-main"
 				return USER_GUEST;
 			}
 			elseif ( preg_match('/^(update|delete)/', $event->Special) ) {
 				// This way we can have 2+ objects stating with same special, e.g. "u.update-sidebox" and "u.update-profile".
 				return $this->Application->RecallVar('user_id');
 			}
 
 			return parent::getPassedID($event);
 		}
 
 		/**
 		 * Allows to change root password
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnUpdatePassword($event)
 		{
 			$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
 			if ( !$items_info ) {
 				return;
 			}
 
 			list ($id, $field_values) = each($items_info);
 			$user_id = $this->Application->RecallVar('user_id');
 
 			if ( $id == $user_id && ($user_id > 0 || $user_id == USER_ROOT) ) {
+				/** @var kDBItem $user_dummy */
 				$user_dummy = $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true));
-				/* @var $user_dummy kDBItem */
 
 				$user_dummy->Load($id);
 				$status_field = $event->getUnitConfig()->getStatusField(true);
 
 				if ( $user_dummy->GetDBField($status_field) != STATUS_ACTIVE ) {
 					// not active user is not allowed to update his record (he could not activate himself manually)
 					return ;
 				}
 			}
 
 			if ( $user_id == USER_ROOT ) {
+				/** @var UsersItem $object */
 				$object = $event->getObject(Array ('skip_autoload' => true));
-				/* @var $object UsersItem */
 
 				// this is internal hack to allow root/root passwords for dev
 				if ( $this->Application->isDebugMode() && $field_values['RootPassword'] == 'root' ) {
 					$object->SetFieldOption('RootPassword', 'min_length', 4);
 				}
 
 				$this->RemoveRequiredFields($object);
 				$object->SetDBField('RootPassword', $this->Application->ConfigValue('RootPass'));
 
 				$object->setID(-1);
 				$object->SetFieldsFromHash($field_values);
 				$event->setEventParam('form_data', $field_values);
 
 				if ( $object->Validate() ) {
 					// validation on, password match too
 					$fields_hash = Array ('VariableValue' => $object->GetDBField('RootPassword'));
 					$conf_table = $this->Application->getUnitConfig('conf')->getTableName();
 					$this->Conn->doUpdate($fields_hash, $conf_table, 'VariableName = "RootPass"');
 					$event->SetRedirectParam('opener', 'u');
 				}
 				else {
 					$event->status = kEvent::erFAIL;
 					$event->redirect = false;
 					return ;
 				}
 			}
 			else {
 				/** @var kDBItem $object */
 				$object = $event->getObject();
 
 				$object->SetFieldsFromHash($field_values);
 				$event->setEventParam('form_data', $field_values);
 
 				if ( !$object->Update() ) {
 					$event->status = kEvent::erFAIL;
 					$event->redirect = false;
 				}
 			}
 
 			$event->SetRedirectParam('opener', 'u');
 		}
 
 		/**
 		 * Resets grid settings, remembered in each user record
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnMassResetSettings($event)
 		{
 			if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
 				$event->status = kEvent::erFAIL;
 				return;
 			}
 
 			$ids = $this->StoreSelectedIDs($event);
 
 			$default_user_id = $this->Application->ConfigValue('DefaultSettingsUserId');
 			if ( in_array($default_user_id, $ids) ) {
 				array_splice($ids, array_search($default_user_id, $ids), 1);
 			}
 
 			if ( $ids ) {
 				$q = 'DELETE FROM ' . TABLE_PREFIX . 'UserPersistentSessionData WHERE PortalUserId IN (' . join(',', $ids) . ') AND
 							 (VariableName LIKE "%_columns_%"
 							 OR
 							 VariableName LIKE "%_filter%"
 							 OR
 							 VariableName LIKE "%_PerPage%")';
 				$this->Conn->Query($q);
 			}
 
 			$this->clearSelectedIDs($event);
 		}
 
 		/**
 		 * Checks, that currently loaded item is allowed for viewing (non permission-based)
 		 *
 		 * @param kEvent $event
 		 * @return bool
 		 * @access protected
 		 */
 		protected function checkItemStatus(kEvent $event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			if ( !$object->isLoaded() ) {
 				return true;
 			}
 
 			$virtual_users = Array (USER_ROOT, USER_GUEST);
 
 			return ($object->GetDBField('Status') == STATUS_ACTIVE) || in_array($object->GetID(), $virtual_users);
 		}
 
 		/**
 		 * Sends approved/declined email event on user status change
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemUpdate(kEvent $event)
 		{
 			parent::OnAfterItemUpdate($event);
 
 			$this->afterItemChanged($event);
 
+			/** @var UsersItem $object */
 			$object = $event->getObject();
-			/* @var $object UsersItem */
 
 			if ( !$this->Application->isAdmin && ($event->Special != 'email-restore') ) {
 				$this->sendEmailChangeEvent($event);
 			}
 
 			if ( !$this->Application->isAdmin || $object->IsTempTable() ) {
 				return;
 			}
 
 			$this->sendStatusChangeEvent($object->GetID(), $object->GetOriginalField('Status'), $object->GetDBField('Status'));
 		}
 
 		/**
 		 * Occurs, after item is changed
 		 *
 		 * @param kEvent $event
 		 */
 		protected function afterItemChanged($event)
 		{
 			$this->saveUserImages($event);
 
+			/** @var UsersItem $object */
 			$object = $event->getObject();
-			/* @var $object UsersItem */
 
 			if ( $object->GetDBField('EmailPassword') && $object->GetDBField('Password_plain') ) {
 				$email_passwords = $this->Application->RecallVar('email_passwords');
 				$email_passwords = $email_passwords ? unserialize($email_passwords) : Array ();
 
 				$email_passwords[ $object->GetID() ] = $object->GetDBField('Password_plain');
 				$this->Application->StoreVar('email_passwords', serialize($email_passwords));
 			}
 
 			// update user subscription status (via my profile or new user registration)
 			if ( !$this->Application->isAdmin && !$object->isSubscriberOnly() ) {
 				if ( $object->GetDBField('SubscribeToMailing') && !$object->isSubscribed() ) {
 					$this->AddSubscriberGroup($object);
 				}
 				elseif ( !$object->GetDBField('SubscribeToMailing') && $object->isSubscribed() ) {
 					$this->RemoveSubscriberGroup( $object->GetID() );
 				}
 			}
 		}
 
 		/**
 		 * Stores user's original Status before overwriting with data from temp table
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeDeleteFromLive(kEvent $event)
 		{
 			parent::OnBeforeDeleteFromLive($event);
 
 			$user_id = $event->getEventParam('id');
 			$user_status = $this->Application->GetVar('user_status', Array ());
 
 			if ( $user_id > 0 ) {
 				$user_status[$user_id] = $this->getUserStatus($user_id);
 				$this->Application->SetVar('user_status', $user_status);
 			}
 		}
 
 		/**
 		 * Sends approved/declined email event on user status change (in temp tables during editing)
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterCopyToLive(kEvent $event)
 		{
 			parent::OnAfterCopyToLive($event);
 
 			$temp_id = $event->getEventParam('temp_id');
 			$email_passwords = $this->Application->RecallVar('email_passwords');
 
 			if ( $email_passwords ) {
 				$email_passwords = unserialize($email_passwords);
 
 				if ( isset($email_passwords[$temp_id]) ) {
+					/** @var kDBItem $object */
 					$object = $event->getObject();
-					/* @var $object kDBItem */
 
 					$object->SwitchToLive();
 					$object->Load( $event->getEventParam('id') );
 					$object->SetField('Password', $email_passwords[$temp_id]);
 					$object->SetField('VerifyPassword', $email_passwords[$temp_id]);
 
 					$this->Application->emailUser($temp_id > 0 ? 'USER.NEW.PASSWORD': 'USER.ADD.BYADMIN', $object->GetID(), $object->getEmailParams());
 
 					unset($email_passwords[$temp_id]);
 					$this->Application->StoreVar('email_passwords', serialize($email_passwords));
 				}
 			}
 
 			if ( $temp_id > 0 ) {
 				// only send status change e-mail on user update
 				$new_status = $this->getUserStatus($temp_id);
 				$user_status = $this->Application->GetVar('user_status');
 
 				$this->sendStatusChangeEvent($temp_id, $user_status[$temp_id], $new_status);
 			}
 		}
 
 		/**
 		 * Returns user status (active, pending, disabled) based on ID and temp mode setting
 		 *
 		 * @param int $user_id
 		 * @return int
 		 */
 		function getUserStatus($user_id)
 		{
 			$config = $this->getUnitConfig();
 
 			$sql = 'SELECT Status
 					FROM '. $config->getTableName() .'
 					WHERE '. $config->getIDField() .' = '.$user_id;
 
 			return $this->Conn->GetOne($sql);
 		}
 
 		/**
 		 * Sends approved/declined email event on user status change
 		 *
 		 * @param int $user_id
 		 * @param int $prev_status
 		 * @param int $new_status
 		 */
 		function sendStatusChangeEvent($user_id, $prev_status, $new_status)
 		{
 			$status_events = Array (
 				STATUS_ACTIVE	=>	'USER.APPROVE',
 				STATUS_DISABLED	=>	'USER.DENY',
 			);
 			$email_event = isset($status_events[$new_status]) ? $status_events[$new_status] : false;
 
 			if (($prev_status != $new_status) && $email_event) {
 
 				$send_params = Array (
 					'PrefixSpecial' => 'u',
 					'item_id' => $user_id,
 				);
 
 				$this->Application->emailUser($email_event, $user_id, $send_params);
 				$this->Application->emailAdmin($email_event, null, $send_params);
 			}
 
 			// deletes sessions from users, that are no longer active
 			if (($prev_status != $new_status) && ($new_status != STATUS_ACTIVE)) {
 				$sql = 'SELECT SessionKey
 						FROM ' . TABLE_PREFIX . 'UserSessions
 						WHERE PortalUserId = ' . $user_id;
 				$session_ids = $this->Conn->GetCol($sql);
 
 				$this->Application->Session->DeleteSessions($session_ids);
 			}
 		}
 
 		/**
 		 * Sends restore/validation email event on user email change
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function sendEmailChangeEvent(kEvent $event)
 		{
+			/** @var UsersItem $object */
 			$object = $event->getObject();
-			/* @var $object UsersItem */
 
 			$new_email = $object->GetDBField('Email');
 			$prev_email = $object->GetOriginalField('Email');
 
 			if ( !$new_email || ($prev_email == $new_email) ) {
 				return;
 			}
 
 			$prev_emails = $object->GetDBField('PrevEmails');
 			$prev_emails = $prev_emails ? unserialize($prev_emails) : Array ();
 
 			$fields_hash = Array (
 				'PrevEmails' => serialize($prev_emails),
 				'EmailVerified' => 0,
 			);
 
 			$user_id = $object->GetID();
 
 			if ( $prev_email ) {
 				$hash = md5(TIMENOW + $user_id);
 				$prev_emails[$hash] = $prev_email;
 				$fields_hash['PrevEmails'] = serialize($prev_emails);
 
 				$send_params = Array (
 					'hash' => $hash,
 					'to_email' => $prev_email,
 					'to_name' => trim($object->GetDBField('FirstName') . ' ' . $object->GetDBField('LastName')),
 				);
 
 				$this->Application->emailUser('USER.EMAIL.CHANGE.UNDO', null, $object->getEmailParams($send_params));
 			}
 
 			if ( $new_email ) {
 				$this->Application->emailUser('USER.EMAIL.CHANGE.VERIFY', $user_id, $object->getEmailParams());
 			}
 
 			// direct DB update, since USER.EMAIL.CHANGE.VERIFY puts verification code in user record, that we don't want to loose
 			$this->Conn->doUpdate($fields_hash, $object->TableName, 'PortalUserId = ' . $user_id);
 		}
 
 		/**
 		 * OnAfterConfigRead for users
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterConfigRead(kEvent $event)
 		{
 			parent::OnAfterConfigRead($event);
 
 			$config = $event->getUnitConfig();
 			$default_form = $config->getFormByName('default');
 			$form_fields =& $default_form['Fields'];
 
 			// 1. arrange user registration countries
+			/** @var SiteHelper $site_helper */
 			$site_helper = $this->Application->recallObject('SiteHelper');
-			/* @var $site_helper SiteHelper */
 
 			$first_country = $site_helper->getDefaultCountry('', false);
 
 			if ($first_country === false) {
 				$first_country = $this->Application->ConfigValue('User_Default_Registration_Country');
 			}
 
 			if ($first_country) {
 				// update user country dropdown sql
 				$form_fields['Country']['options_sql'] = preg_replace('/ORDER BY (.*)/', 'ORDER BY IF (CountryStateId = '.$first_country.', 1, 0) DESC, \\1', $form_fields['Country']['options_sql']);
 			}
 
 			// 2. set default user registration group
 			$form_fields['PrimaryGroupId']['default'] = $this->Application->ConfigValue('User_NewGroup');
 
 			// 3. allow avatar upload on Front-End
+			/** @var FileHelper $file_helper */
 			$file_helper = $this->Application->recallObject('FileHelper');
-			/* @var $file_helper FileHelper */
 
 			$file_helper->createItemFiles($event->Prefix, true); // create image fields
 
 			if ($this->Application->isAdminUser) {
 				// 4. when in administrative console, then create all users with Active status
 				$form_fields['Status']['default'] = STATUS_ACTIVE;
 
 				// 5. remove groups tab on editing forms when AdvancedUserManagement config variable not set
 				if (!$this->Application->ConfigValue('AdvancedUserManagement')) {
 					$edit_tab_presets = $config->getEditTabPresets();
 
 					foreach ($edit_tab_presets as $preset_name => $preset_tabs) {
 						if (array_key_exists('groups', $preset_tabs)) {
 							unset($edit_tab_presets[$preset_name]['groups']);
 
 							if (count($edit_tab_presets[$preset_name]) == 1) {
 								// only 1 tab left -> remove it too
 								$edit_tab_presets[$preset_name] = Array ();
 							}
 						}
 					}
 
 					$config->setEditTabPresets($edit_tab_presets);
 				}
 			}
 
 			if ( $this->Application->ConfigValue('RegistrationUsernameRequired') ) {
 				// Username becomes required only, when it's used in registration process
 				$max_username = $this->Application->ConfigValue('MaxUserName');
 
 				$form_fields['Username']['required'] = 1;
 				$form_fields['Username']['min_len'] = $this->Application->ConfigValue('Min_UserName');
 				$form_fields['Username']['max_len'] = $max_username ? $max_username : 255;
 			}
 
 			$config->addForms($default_form, 'default');
 		}
 
 		/**
 		 * OnMassCloneUsers
 		 *
 		 * @param kEvent $event
 		 */
 		function OnMassCloneUsers($event)
 		{
 			if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
 				$event->status = kEvent::erFAIL;
 				return;
 			}
 
+			/** @var kTempTablesHandler $temp_handler */
 			$temp_handler = $this->Application->recallObject($event->Prefix.'_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
-			/* @var $temp_handler kTempTablesHandler */
 
 			$ids = $this->StoreSelectedIDs($event);
 			$temp_handler->CloneItems($event->Prefix, '', $ids);
 			$this->clearSelectedIDs($event);
 		}
 
 		/**
 		 * When cloning users, reset password (set random)
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeClone(kEvent $event)
 		{
 			parent::OnBeforeClone($event);
 
+			/** @var UsersItem $object */
 			$object = $event->getObject();
-			/* @var $object UsersItem */
 
 			$object->generatePassword();
 			$object->SetDBField('ResourceId', 0); // this will reset it
 
 			// change email because it should be unique
 			$object->NameCopy(Array (), $object->GetID(), 'Email', 'copy%1$s.%2$s');
 		}
 
 		/**
 		 * Saves selected ids to session
 		 *
 		 * @param kEvent $event
 		 */
 		function OnSaveSelected($event)
 		{
 			$this->StoreSelectedIDs($event);
 
 			// remove current ID, otherwise group selector will use it in filters
 			$this->Application->DeleteVar($event->getPrefixSpecial(true) . '_id');
 		}
 
 		/**
 		 * Sets primary group of selected users
 		 *
 		 * @param kEvent $event
 		 */
 		function OnProcessSelected($event)
 		{
 			$event->SetRedirectParam('opener', 'u');
 			$user_ids = $this->getSelectedIDs($event, true);
 			$this->clearSelectedIDs($event);
 
 			$dst_field = $this->Application->RecallVar('dst_field');
 			if ($dst_field != 'PrimaryGroupId') {
 				return ;
 			}
 
 			$group_ids = array_keys($this->Application->GetVar('g'));
 			$primary_group_id = $group_ids ? array_shift($group_ids) : false;
 
 			if (!$user_ids || !$primary_group_id) {
 				return ;
 			}
 
 			$table_name = $this->Application->getUnitConfig('ug')->getTableName();
 
 			// 1. mark group as primary
 			$sql = 'UPDATE ' . TABLE_PREFIX . 'Users
 					SET PrimaryGroupId = ' . $primary_group_id . '
 					WHERE PortalUserId IN (' . implode(',', $user_ids) . ')';
 			$this->Conn->Query($sql);
 
 			$sql = 'SELECT PortalUserId
 					FROM ' . $table_name . '
 					WHERE (GroupId = ' . $primary_group_id . ') AND (PortalUserId IN (' . implode(',', $user_ids) . '))';
 			$existing_members = $this->Conn->GetCol($sql);
 
 			// 2. add new members to a group
 			$new_members = array_diff($user_ids, $existing_members);
 
 			foreach ($new_members as $user_id) {
 				$fields_hash = Array (
 					'GroupId' => $primary_group_id,
 					'PortalUserId' => $user_id,
 				);
 
 				$this->Conn->doInsert($fields_hash, $table_name);
 			}
 		}
 
 		/**
 		 * Loads user images
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemLoad(kEvent $event)
 		{
 			parent::OnAfterItemLoad($event);
 
 			// linking existing images for item with virtual fields
+			/** @var ImageHelper $image_helper */
 			$image_helper = $this->Application->recallObject('ImageHelper');
-			/* @var $image_helper ImageHelper */
 
+			/** @var UsersItem $object */
 			$object = $event->getObject();
-			/* @var $object UsersItem */
 
 			$image_helper->LoadItemImages($object);
 
+			/** @var kCountryStatesHelper $cs_helper */
 			$cs_helper = $this->Application->recallObject('CountryStatesHelper');
-			/* @var $cs_helper kCountryStatesHelper */
 
 			$cs_helper->PopulateStates($event, 'State', 'Country');
 
 			// get user subscription status
 			$object->SetDBField('SubscribeToMailing', $object->isSubscribed() ? 1 : 0);
 
 			if ( !$this->Application->isAdmin ) {
 				$object->SetFieldOption('FrontLanguage', 'options', $this->getEnabledLanguages());
 			}
 		}
 
 		/**
 		 * Returns list of enabled languages with their names
 		 *
 		 * @return Array
 		 * @access protected
 		 */
 		protected function getEnabledLanguages()
 		{
 			$cache_key = 'user_languages[%LangSerial%]';
 
 			$ret = $this->Application->getCache($cache_key);
 
 			if ( $ret === false ) {
+				/** @var kDBList $languages */
 				$languages = $this->Application->recallObject('lang.enabled', 'lang_List');
-				/* @var $languages kDBList */
 
 				$ret = Array ();
 
 				foreach ($languages as $language_info) {
 					$ret[$languages->GetID()] = $language_info['LocalName'];
 				}
 
 				$this->Application->setCache($cache_key, $ret);
 			}
 
 			return $ret;
 		}
 
 		/**
 		 * Save user images
 		 *
 		 * @param kEvent $event
 		 */
 		function saveUserImages($event)
 		{
 			if (!$this->Application->isAdmin) {
+				/** @var ImageHelper $image_helper */
 				$image_helper = $this->Application->recallObject('ImageHelper');
-				/* @var $image_helper ImageHelper */
 
+				/** @var kDBItem $object */
 				$object = $event->getObject();
-				/* @var $object kDBItem */
 
 				// process image upload in virtual fields
 				$image_helper->SaveItemImages($object);
 			}
 		}
 
 		/**
 		 * Makes password required for new users
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnPreCreate(kEvent $event)
 		{
 			parent::OnPreCreate($event);
 
 			if ( $event->status != kEvent::erSUCCESS ) {
 				return;
 			}
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$user_type = $this->Application->GetVar('user_type');
 
 			if ( $user_type ) {
 				$object->SetDBField('UserType', $user_type);
 
 				if ( $user_type == UserType::ADMIN ) {
 					$object->SetDBField('PrimaryGroupId', $this->Application->ConfigValue('User_AdminGroup'));
 				}
 			}
 
 			if ( $this->Application->ConfigValue('User_Password_Auto') ) {
 				$object->SetDBField('EmailPassword', 1);
 			}
 
 			$this->_makePasswordRequired($event);
 		}
 
 		/**
 		 * Makes password required for new users
 		 *
 		 * @param kEvent $event
 		 */
 		function _makePasswordRequired($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$required_fields = Array ('Password', 'Password_plain', 'VerifyPassword', 'VerifyPassword_plain');
 			$object->setRequired($required_fields);
 		}
 
 		/**
 		 * Load item if id is available
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function LoadItem(kEvent $event)
 		{
 			$id = $this->getPassedID($event);
 
 			if ( $id < 0 ) {
 				// when root, guest and so on
 
+				/** @var kDBItem $object */
 				$object = $event->getObject();
-				/* @var $object kDBItem */
 
 				$object->Clear($id);
 				return;
 			}
 
 			parent::LoadItem($event);
 		}
 
 		/**
 		 * Occurs just after login (for hooking)
 		 *
 		 * @param kEvent $event
 		 */
 		function OnAfterLogin($event)
 		{
 			if ( is_object($event->MasterEvent) && !$this->Application->isAdmin ) {
 				$event->MasterEvent->SetRedirectParam('login', 1);
 			}
 		}
 
 		/**
 		 * Occurs just before logout (for hooking)
 		 *
 		 * @param kEvent $event
 		 */
 		function OnBeforeLogout($event)
 		{
 			if ( is_object($event->MasterEvent) && !$this->Application->isAdmin ) {
 				$event->MasterEvent->SetRedirectParam('logout', 1);
 			}
 		}
 
 		/**
 		 * Generates password
 		 *
 		 * @param kEvent $event
 		 */
 		function OnGeneratePassword($event)
 		{
 			$event->status = kEvent::erSTOP;
 
 			if ( $this->Application->isAdminUser ) {
 				echo kUtil::generatePassword();
 			}
 		}
 
 		/**
 		 * Changes user's password and logges him in
 		 *
 		 * @param kEvent $event
 		 */
 		function OnResetLostPassword($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$event->CallSubEvent('OnUpdate');
 
 			if ( $event->status == kEvent::erSUCCESS ) {
-				/* @var $user_helper UserHelper */
+				/** @var UserHelper $user_helper */
 				$user_helper = $this->Application->recallObject('UserHelper');
 
 			    $user =& $user_helper->getUserObject();
 				$user->Load( $object->GetID() );
 
 				if ( $user_helper->checkLoginPermission() ) {
 		    		$user_helper->loginUserById( $user->GetID() );
 				}
 			}
 		}
 
 		/**
 		 * Generates new Root password and email it
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnResetRootPassword($event)
 		{
+			/** @var kPasswordFormatter $password_formatter */
 			$password_formatter = $this->Application->recallObject('kPasswordFormatter');
-			/* @var $password_formatter kPasswordFormatter */
 
 			$new_root_password = kUtil::generatePassword();
 
 			$this->Application->SetConfigValue('RootPass', $password_formatter->hashPassword($new_root_password));
 			$this->Application->emailAdmin('ROOT.RESET.PASSWORD', null, Array ('password' => $new_root_password));
 
 			$event->SetRedirectParam('reset', 1);
 			$event->SetRedirectParam('pass', 'm');
 		}
 
 		/**
 		 * Perform login of user, selected in Admin Console, on Front-End in a separate window
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnLoginAs(kEvent $event)
 		{
-			/* @var $user_helper UserHelper */
+			/** @var UserHelper $user_helper */
 			$user_helper = $this->Application->recallObject('UserHelper');
 
 			$user =& $user_helper->getUserObject();
 			$user->Load( $this->Application->GetVar('user_id') );
 
 			if ( !$user->isLoaded() ) {
 				return ;
 			}
 
 			if ( $user_helper->checkLoginPermission() ) {
 				$user_helper->loginUserById( $user->GetID() );
 			}
 		}
 	}
Index: branches/5.3.x/core/units/users/users_item.php
===================================================================
--- branches/5.3.x/core/units/users/users_item.php	(revision 16518)
+++ branches/5.3.x/core/units/users/users_item.php	(revision 16519)
@@ -1,220 +1,220 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class UsersItem extends kDBItem {
 
 		/**
 		 * Returns IDs of groups to which user belongs and membership is not expired
 		 *
 		 * @param bool $force_reload
 		 * @return Array
 		 * @access public
 		 */
 		public function getMembershipGroups($force_reload = false)
 		{
 			$user_groups = $this->Application->RecallVar('UserGroups');
 
 			if ( $user_groups === false || $force_reload ) {
 				// primary group goes first
 				$sql = 'SELECT GroupId
 						FROM ' . TABLE_PREFIX . 'UserGroupRelations
 						WHERE (PortalUserId = ' . $this->GetID() . ') AND ( (MembershipExpires IS NULL) OR (MembershipExpires >= ' . time() . ') )
 						ORDER BY IF(GroupId = ' . $this->GetDBField('PrimaryGroupId') . ', 1, 0) DESC';
 				$groups = $this->Conn->GetCol($sql);
 
+				/** @var UserHelper $user_helper */
 				$user_helper = $this->Application->recallObject('UserHelper');
-				/* @var $user_helper UserHelper */
 
 				$user_groups = Array ();
 				$ip_restrictions = $user_helper->getGroupsWithIPRestrictions();
 
 				foreach ($groups as $group_id) {
 					if ( !isset($ip_restrictions[$group_id]) || kUtil::ipMatch($ip_restrictions[$group_id], "\n") ) {
 						$user_groups[] = $group_id;
 					}
 				}
 
 				return $user_groups;
 			}
 
 			return explode(',', $user_groups);
 		}
 
 		function sendEmails()
 		{
 			$send_params = $this->getEmailParams();
 
 			switch ( $this->GetDBField('Status') ) {
 				case STATUS_ACTIVE:
 					$event_name = $this->Application->ConfigValue('User_Password_Auto') ? 'USER.VALIDATE' : 'USER.ADD';
 					$this->Application->emailUser($event_name, $this->GetID(), $send_params);
 					$this->Application->emailAdmin($event_name, null, $send_params);
 					break;
 
 				case STATUS_PENDING:
 					$this->Application->emailUser('USER.ADD.PENDING', $this->GetID(), $send_params);
 					$this->Application->emailAdmin('USER.ADD.PENDING', null, $send_params);
 					break;
 			}
 		}
 
 		/**
 		 * Checks that user is subscriber only
 		 *
 		 * @return bool
 		 */
 		public function isSubscriberOnly()
 		{
 			return $this->GetDBField('PrimaryGroupId') == $this->Application->ConfigValue('User_SubscriberGroup');
 		}
 
 		/**
 		 * Checks that user is subscribed
 		 *
 		 * @return bool
 		 */
 		public function isSubscribed()
 		{
 			$group_id = $this->Application->ConfigValue('User_SubscriberGroup');
 
 			$sql = 'SELECT GroupId
 					FROM ' . TABLE_PREFIX . 'UserGroupRelations
 					WHERE (PortalUserId = ' . $this->GetID() . ') AND (GroupId = ' . $group_id . ')';
 
 			return $this->Conn->GetOne($sql);
 		}
 
 		/**
 		 * Creates a record in the database table with current item' values
 		 *
 		 * @param mixed $force_id Set to TRUE to force creating of item's own ID or to value to force creating of passed id. Do not pass 1 for true, pass exactly TRUE!
 		 * @param bool $system_create
 		 * @return bool
 		 * @access public
 		 */
 		public function Create($force_id = false, $system_create = false)
 		{
 			$ret = parent::Create($force_id, $system_create);
 			if ( $ret ) {
 				// find out how to synchronize user only when it's copied to live table
+				/** @var UsersSyncronizeManager $sync_manager */
 				$sync_manager = $this->Application->recallObject('UsersSyncronizeManager', null, Array (), Array ('InPortalSyncronize'));
-				/* @var $sync_manager UsersSyncronizeManager */
 
 				$sync_manager->performAction('createUser', $this->FieldValues);
 			}
 			return $ret;
 		}
 
 		/**
 		 * Updates previously loaded record with current item' values
 		 *
 		 * @access public
 		 * @param int $id Primary Key Id to update
 		 * @param Array $update_fields
 		 * @param bool $system_update
 		 * @return bool
 		 * @access public
 		 */
 		public function Update($id = null, $update_fields = null, $system_update = false)
 		{
 			$ret = parent::Update($id, $update_fields, $system_update);
 
 			if ( $ret ) {
 				// find out how to synchronize user only when it's copied to live table
+				/** @var UsersSyncronizeManager $sync_manager */
 				$sync_manager = $this->Application->recallObject('UsersSyncronizeManager', null, Array (), Array ('InPortalSyncronize'));
-				/* @var $sync_manager UsersSyncronizeManager */
 
 				$sync_manager->performAction('updateUser', $this->FieldValues);
 			}
 
 			return $ret;
 		}
 
 		/**
 		 * Deletes the record from database
 		 *
 		 * @param int $id
 		 * @return bool
 		 * @access public
 		 */
 		public function Delete($id = null)
 		{
 			$ret = parent::Delete($id);
 
 			if ( $ret ) {
+				/** @var UsersSyncronizeManager $sync_manager */
 				$sync_manager = $this->Application->recallObject('UsersSyncronizeManager', null, Array (), Array ('InPortalSyncronize'));
-				/* @var $sync_manager UsersSyncronizeManager */
 
 				$sync_manager->performAction('deleteUser', $this->FieldValues);
 			}
 
 			return $ret;
 		}
 
 		function setName($full_name)
 		{
 			$full_name = explode(' ', $full_name);
 
 			if (count($full_name) > 2) {
 				$last_name = array_pop($full_name);
 				$first_name = implode(' ', $full_name);
 			}
 			else {
 				$last_name = $full_name[1];
 				$first_name = $full_name[0];
 			}
 
 			$this->SetDBField('FirstName', $first_name);
 			$this->SetDBField('LastName', $last_name);
 		}
 
 		/**
 		 * Generates new password for given user
 		 *
 		 * @param int $length
 		 * @return string
 		 * @access public
 		 */
 		public function generatePassword($length = 10)
 		{
 			$password = kUtil::generatePassword($length);
 
 			$this->SetField('Password', $password);
 			$this->SetField('VerifyPassword', $password);
 
 			return $password;
 		}
 
 		/**
 		 * Returns fields, that are not allowed to be changed from request.
 		 *
 		 * @param array $fields_hash Fields hash.
 		 *
 		 * @return array
 		 */
 		protected function getRequestProtectedFields(array $fields_hash)
 		{
 			$fields = parent::getRequestProtectedFields($fields_hash);
 
 			$fields = array_merge($fields, Array ('PrevEmails', 'ResourceId', 'IPAddress', 'IsBanned', 'PwResetConfirm', 'PwRequestTime', 'OldStyleLogin'));
 
 			if ( !$this->Application->isAdmin ) {
 				$fields = array_merge($fields, Array ('UserType', 'Status', 'EmailVerified', 'IsBanned'));
 			}
 
 			return $fields;
 		}
 	}
Index: branches/5.3.x/core/units/favorites/favorites_eh.php
===================================================================
--- branches/5.3.x/core/units/favorites/favorites_eh.php	(revision 16518)
+++ branches/5.3.x/core/units/favorites/favorites_eh.php	(revision 16519)
@@ -1,116 +1,116 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class FavoritesEventHandler extends kDBEventHandler {
 
 	/**
 	 * Allows to override standard permission mapping
 	 *
 	 * @return void
 	 * @access protected
 	 * @see kEventHandler::$permMapping
 	 */
 	protected function mapPermissions()
 	{
 		parent::mapPermissions();
 
 		$permissions = Array (
 			'OnFavoriteToggle' => Array ('subitem' => true),
 		);
 
 		$this->permMapping = array_merge($this->permMapping, $permissions);
 	}
 
 	/**
 	 * Adds/removes item from favorites
 	 *
 	 * @param kEvent $event
 	 */
 	function OnFavoriteToggle($event)
 	{
 		$config = $event->getUnitConfig();
 		$parent_prefix = $config->getParentPrefix();
 
+		/** @var kDBItem $parent_object */
 		$parent_object = $this->Application->recallObject($parent_prefix);
-		/* @var $parent_object kDBItem */
 
 		if ( !$parent_object->isLoaded() || !$this->Application->CheckPermission('FAVORITES', 0, $parent_object->GetDBField('ParentPath')) ) {
 			$event->status = kEvent::erPERM_FAIL;
 
 			return;
 		}
 
 		$user_id = $this->Application->RecallVar('user_id');
 		$sql = 'SELECT FavoriteId
 				FROM ' . $config->getTableName() . '
 				WHERE (PortalUserId = ' . $user_id . ') AND (ResourceId = ' . $parent_object->GetDBField('ResourceId') . ')';
 		$favorite_id = $this->Conn->GetOne($sql);
 
+		/** @var kDBItem $object */
 		$object = $event->getObject(Array ('skip_autoload' => true));
-		/* @var $object kDBItem */
 
 		if ( $favorite_id ) {
 			$object->Delete($favorite_id);
 		}
 		else {
 			$object->Create();
 		}
 
 		$event->SetRedirectParam('pass', 'm,' . $parent_prefix);
 	}
 
 	/**
 	 * Prepares Favorite record fields
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnBeforeItemCreate(kEvent $event)
 	{
 		parent::OnBeforeItemCreate($event);
 
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		$user_id = $this->Application->RecallVar('user_id');
 		$object->SetDBField('PortalUserId', $user_id);
 
 		$parent_prefix = $event->getUnitConfig()->getParentPrefix();
 
+		/** @var kDBItem $parent_object */
 		$parent_object = $this->Application->recallObject($parent_prefix);
-		/* @var $parent_object kDBItem */
 
 		$object->SetDBField('ResourceId', $parent_object->GetDBField('ResourceId'));
 		$object->SetDBField('ItemTypeId', $this->Application->getUnitConfig($parent_prefix)->getItemType());
 	}
 
 	/**
 	 * [HOOK] Deletes favorite record to item, that is being deleted
 	 *
 	 * @param kEvent $event
 	 */
 	function OnDeleteFavoriteItem($event)
 	{
 		$main_object = $event->MasterEvent->getObject();
 		/* @var $main_object kDBItem */
 
 		$sql = 'DELETE FROM ' . $event->getUnitConfig()->getTableName() . '
 				WHERE ResourceId = ' . $main_object->GetDBField('ResourceId');
 		$this->Conn->Query($sql);
 	}
 
-}
\ No newline at end of file
+}
Index: branches/5.3.x/core/units/files/file_eh.php
===================================================================
--- branches/5.3.x/core/units/files/file_eh.php	(revision 16518)
+++ branches/5.3.x/core/units/files/file_eh.php	(revision 16519)
@@ -1,111 +1,111 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class FileEventHandler extends kDBEventHandler {
 
 		/**
 		 * Allows to override standard permission mapping
 		 *
 		 * @return void
 		 * @access protected
 		 * @see kEventHandler::$permMapping
 		 */
 		protected function mapPermissions()
 		{
 			parent::mapPermissions();
 
 			$permissions = Array (
 				'OnDownloadFile' => Array ('subitem' => 'view'),
 			);
 
 			$this->permMapping = array_merge($this->permMapping, $permissions);
 		}
 
 		/**
 		 * Remembers user, who is created file record. Makes file primary if no other files are uploaded.
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemCreate(kEvent $event)
 		{
 			parent::OnBeforeItemCreate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$object->SetDBField('CreatedById', $this->Application->RecallVar('user_id'));
 		}
 
 		/**
 		 * Resets primary file mark when more then one file is marked as primary
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemUpdate(kEvent $event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			if ( !$object->GetDBField('FileName') ) {
 				$object->SetDBField('FileName', basename($object->GetDBField('FilePath')));
 			}
 		}
 
 		/**
 		 * Apply any custom changes to list's sql query
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
 		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			if ( !$this->Application->isAdminUser ) {
 				$object->addFilter('active_filter', '%1$s.Status = ' . STATUS_ACTIVE);
 			}
 		}
 
 		/**
 		 * Returns file contents associated with item
 		 *
 		 * @param kEvent $event
 		 */
 		function OnDownloadFile($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
+			/** @var FileHelper $file_helper */
 			$file_helper = $this->Application->recallObject('FileHelper');
-			/* @var $file_helper FileHelper */
 
 			$filename = $object->GetField('FilePath', 'full_path');
 			$file_helper->DownloadFile($filename);
 
 			$event->status = kEvent::erSTOP;
 		}
 	}
\ No newline at end of file
Index: branches/5.3.x/core/units/files/file_tp.php
===================================================================
--- branches/5.3.x/core/units/files/file_tp.php	(revision 16518)
+++ branches/5.3.x/core/units/files/file_tp.php	(revision 16519)
@@ -1,37 +1,37 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class FileTagProcessor extends kDBTagProcessor {
 
 		function DownloadFileLink($params)
 		{
 			$params[$this->getPrefixSpecial() . '_event'] = 'OnDownloadFile';
 			$params['pass'] = 'm,' . $this->getUnitConfig()->getParentPrefix() . ',' . $this->getPrefixSpecial();
 
 			return $this->ItemLink($params);
 		}
 
 		function FileIcon($params)
 		{
+			/** @var kDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBItem */
 
 			$last_dot = mb_strrpos($object->GetDBField('FilePath'), '.');
 			$ext = ($last_dot !== false) ? mb_substr($object->GetDBField('FilePath'), $last_dot + 1).'.gif' : '';
 
 			return $ext ? $ext : $params['default'];
 		}
 	}
\ No newline at end of file
Index: branches/5.3.x/core/units/helpers/xml_helper.php
===================================================================
--- branches/5.3.x/core/units/helpers/xml_helper.php	(revision 16518)
+++ branches/5.3.x/core/units/helpers/xml_helper.php	(revision 16519)
@@ -1,608 +1,610 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class kXMLHelper extends kHelper {
 
 		/**
 		 * Normal mode for XMLHelper
 		 *
 		 */
 		const XML_NO_TEXT_NODES = 1;
 
 		/**
 		 * Will create text nodes for every char-data (used in kPDFHelper)
 		 *
 		 */
 		const XML_WITH_TEXT_NODES =  2;
 
 		/**
 		 * Root node after parsing xml document
 		 *
 		 * @var kXMLNode
 		 * @access protected
 		 */
 		protected $RootElement = null;
 
 		/**
 		 * Xml node, that is currently being processed
 		 *
 		 * @var kXMLNode
 		 * @access protected
 		 */
 		protected $CurrentElement = null;
 
 		var $Mode;
 
 		var $XMLNodeClassName = 'kXMLNode';
 
 		public function __construct()
 		{
 			parent::__construct();
 
 			if ( version_compare(PHP_VERSION, '5.0.0') === 1 ) {
 				$this->XMLNodeClassName = 'kXMLNode5';
 				kUtil::includeOnce( dirname(__FILE__) . DIRECTORY_SEPARATOR . 'xml_helper5.php' );
 			}
 		}
 
 		/**
 		 * Parses XML data specified and returns root node
 		 *
 		 * @param string $xml
 		 * @param int $mode
 		 * @param bool $no_case_folding
 		 * @return kXMLNode
 		 * @access public
 		 */
 		public function &Parse($xml = null, $mode = self::XML_NO_TEXT_NODES, $no_case_folding = false)
 		{
 			$xml = trim($xml);
 			$this->Mode = !isset($mode) ? self::XML_NO_TEXT_NODES : $mode;
 			$this->Clear(); // in case if Parse method is called more then one time
 			$xml_parser = xml_parser_create();
 
 			if ( $no_case_folding ) {
 				xml_parser_set_option($xml_parser, XML_OPTION_CASE_FOLDING, 0);
 			}
 
 			xml_set_element_handler($xml_parser, Array (&$this, 'startElement'), Array (&$this, 'endElement'));
 			xml_set_character_data_handler($xml_parser, Array (&$this, 'characterData'));
 
 			if ( !xml_parse($xml_parser, $xml, 1) ) {
 				$class_name = $this->XMLNodeClassName;
 				$byte = xml_get_current_byte_index($xml_parser);
 				$extract = '...' . mb_substr($xml, $byte - 50, 50) . ' !!![' . mb_substr($xml, $byte, 1) . ']!!! ' . mb_substr($xml, $byte + 1, 50) . '...';
 
 				$message = sprintf(
 					'XML error number %s: %s at line %d col %d, byte %d, extract: %s',
 					xml_get_error_code($xml_parser),
 					xml_error_string( xml_get_error_code($xml_parser) ),
 					xml_get_current_line_number($xml_parser),
 					xml_get_current_column_number($xml_parser),
 					xml_get_current_byte_index($xml_parser),
 					$extract
 				);
 
 				$this->RootElement =& new $class_name('ERROR', array ('code' => xml_get_error_code($xml_parser), 'message' => $message));
 
 				trigger_error($message, E_USER_WARNING);
 			}
 
 			xml_parser_free($xml_parser);
 
+			/** @var kXMLNode $root_copy */
 			$root_copy = $this->RootElement;
-			/* @var $root_copy kXMLNode */
 
 			unset($this->RootElement);
 			unset($this->CurrentElement);
 
 			return $root_copy;
 		}
 
 		function ConvertHTMLEntities($s)
 		{
 			//build first an assoc. array with the entities we want to match
 			$table1 = get_html_translation_table(HTML_ENTITIES, ENT_QUOTES);
 
 			$patterns = array();
 			$replacements = array();
 			//now build another assoc. array with the entities we want to replace (numeric entities)
 			foreach ($table1 as $k=>$v){
 			  $patterns[] = "/$v/";
 		//	  $c = htmlentities($k,ENT_QUOTES,"UTF-8");
 			  $replacements[] = "&#".ord($k).";";
 			}
 
 			//now perform a replacement using preg_replace
 			//each matched value in array 1 will be replaced with the corresponding value in array 2
 			$s = preg_replace($patterns,$replacements,$s);
 
 			return $s;
 		}
 
 		function startElement(&$Parser, &$Elem, $Attrs)
 		{
 			$parent =& $this->CurrentElement; // 1. $parent is now reference to $this->CurrentElement
 			$class_name = $this->XMLNodeClassName;
 			$this->CurrentElement =& new $class_name($Elem, $Attrs); // 2. =& ensures, that new object won't be assigned to $parent as well (don't remove)
 
 			if (!isset($this->RootElement) || is_null($this->RootElement)) {
 				$this->RootElement =& $this->CurrentElement;
 			}
 
 			if (!is_null($parent)) {
 				$parent->AddChild($this->CurrentElement);
 			}
 		}
 
 		function characterData($Parser, $Line)
 		{
 			if ($this->Mode == self::XML_WITH_TEXT_NODES) {
 				$class_name = $this->XMLNodeClassName;
+
+				/** @var kXMLNode $text_node */
 				$text_node = new $class_name('_TEXT_');
-				/* @var $text_node kXMLNode */
 
 				$text_node->AppendData($Line);
 				$this->CurrentElement->AddChild( $text_node );
 			}
 			else {
 				$this->CurrentElement->AppendData($Line);
 			}
 		}
 
 		function endElement($Parser, $Elem)
 		{
 			if ($this->Mode == self::XML_WITH_TEXT_NODES) {
 				/*if (count($this->CurrentElement->Children) == 1 && $this->CurrentElement->firstChild->Name == '_TEXT_') {
 					$this->CurrentElement->Children = array();
 				}*/
 			}
 
 			if ($this->CurrentElement->Parent != null) {
 				$this->CurrentElement =& $this->CurrentElement->Parent;
 			}
 		}
 
 		function Clear()
 		{
 			unset($this->RootElement);
 			unset($this->CurrentElement);
 		}
 
 		function &CreateNode($name, $value=null, $attributes=array())
 		{
 			$class_name = $this->XMLNodeClassName;
+
+			/** @var kXMLNode $node */
 			$node = new $class_name($name, $attributes);
-			/* @var $node kXMLNode */
 
 			if ($value) {
 				$node->SetData($value);
 			}
 			return $node;
 		}
 
 		/**
 		 * Checks, that there is no error during XML document parsing
 		 *
 		 * @param kXMLNode $root_node
 		 * @param string $root_node_name
 		 * @return bool
 		 * @access public
 		 */
 		public function isError(&$root_node, $root_node_name)
 		{
 			if ( !is_object($root_node) || !preg_match('/^kxmlnode/i', get_class($root_node)) || ($root_node->Name == 'ERROR') || ($root_node->Name != $root_node_name) ) {
 				return true;
 			}
 
 			return false;
 		}
 	}
 
 	class kXMLNode {
 
 		/**
 		 * Casefolded name of this node
 		 *
 		 * @var string
 		 */
 		var $Name = null;
 
 		/**
 		 * Original name of this node
 		 *
 		 * @var string
 		 */
 		var $OriginalName = null;
 
 		/**
 		 * Casefolded attributes of this node
 		 *
 		 * @var Array
 		 */
 		var $Attributes = array();
 
 		/**
 		 * Original attributes of this node
 		 *
 		 * @var Array
 		 */
 		var $OriginalAttributes = array();
 
 		/**
 		 * List of node child nodes
 		 *
 		 * @var Array
 		 * @access public
 		 */
 		public $Children = Array ();
 
 		/**
 		 * Node content (usually text)
 		 *
 		 * @var string
 		 */
 		var $Data = null;
 
 		/**
 		 * Reference to first child
 		 *
 		 * @var kXMLNode
 		 */
 		var $firstChild = null;
 
 		/**
 		 * Last child of this node
 		 *
 		 * @var kXMLNode
 		 */
 		var $lastChild = null;
 
 		/**
 		 * Parent node
 		 *
 		 * @var kXMLNode
 		 */
 		var $Parent = null;
 
 		/**
 		 * Node position relative to other nodes of it's parent
 		 *
 		 * @var int
 		 */
 		var $Position = 0;
 
 		/**
 		 * Node identifier
 		 *
 		 * @var int
 		 */
 		var $CRC = null;
 
 		function __construct($name, $attributes = Array())
 		{
 			$this->Name = strtoupper($name);
 			$this->OriginalName = $name;
 			$this->OriginalAttributes = $attributes;
 
 			foreach ($attributes as $attr => $value) {
 				$this->Attributes[strtoupper($attr)] = $value;
 			}
 
 			$this->CRC = crc32($this->Name . implode('', array_keys($this->Attributes)) . implode('', array_values($this->Attributes)));
 		}
 
 		/**
 		 * Returns attribute value, first checking it casesensitively, then caseinsensitively
 		 * If attribute is not set returns default value (if passed), or false otherwise
 		 *
 		 * @param string $name
 		 * @param mixed $default
 		 * @return string
 		 */
 		function GetAttribute($name, $default=false)
 		{
 			if (isset($this->OriginalAttributes[$name])) {
 				return $this->OriginalAttributes[$name];
 			}
 
 			return isset($this->Attributes[strtoupper($name)]) ? $this->Attributes[strtoupper($name)] : $default;
 		}
 
 		function SetParent(&$elem)
 		{
 			$this->Parent =& $elem;
 		}
 
 		/**
 		 * Adds new child to current node
 		 *
 		 * @param kXMLNode $a_child
 		 */
 		function AddChild(&$a_child)
 		{
 			$node_count = count($this->Children);
 			$a_child->Position = $node_count;
 
 			if ($node_count == 0) {
 				$this->firstChild =& $a_child;
 				$this->lastChild =& $a_child;
 			}
 			else {
 				$this->lastChild =& $a_child;
 			}
 
 			$this->Children[] =& $a_child;
 			$a_child->SetParent($this);
 		}
 
 		/**
 		 * Appends data to current node
 		 *
 		 * @param string $data
 		 */
 		function AppendData($data)
 		{
 			$this->Data .= $data;
 		}
 
 		/**
 		 * Returns child node by given path
 		 *
 		 * @param string $path
 		 * @return kXMLNode
 		 */
 		function &GetChild($path)
 		{
 			$entries = explode('/', strtoupper($path));
 			$cur = array_shift($entries);
 			if ($cur == $this->Name) $cur = array_shift($entries);
 			if (!$cur) return $this;
 			if (!isset($this->Children[$cur])) return false;
 			$left = implode('/', $entries);
 			if (!$left) return $this->Children[$cur];
 			return $this->Children[$cur]->GetChild($left);
 		}
 
 		function &GetFirstChild()
 		{
 			return $this->firstChild;
 		}
 
 		/**
 		 * Returns node value by given path
 		 *
 		 * @param string $path
 		 * @return string
 		 */
 		function GetChildValue($path)
 		{
 			$child =& $this->GetChild($path);
 
 			return $child !== false ? $child->Data : '';
 		}
 
 		/**
 		 * Returns child node by given position among it siblings
 		 *
 		 * @param int $position
 		 * @return kXMLNode
 		 */
 		function &GetChildByPosition($position)
 		{
 			if ($position < count($this->Children) ) {
 				return $this->Children[$position];
 			}
 			else {
 				$false = false;
 				return $false;
 			}
 		}
 
 		/**
 		 * Recursively searches for child with given name under current node
 		 *
 		 * @param string $name
 		 * @return kXMLNode
 		 */
 		function &FindChild($name)
 		{
 			$name = strtoupper($name);
 			if ( $this->Name == $name ) {
 				return $this;
 			}
 
 			/*if ( isset($this->Children[$name]) ) {
 				return $this->Children[$name];
 			}
 
 			$children = array_keys($this->Children);*/
 
 			foreach ($this->Children as $elem) {
-				/* @var $elem kXMLNode */
+				/** @var kXMLNode $elem */
 
 				$child =& $elem->FindChild($name);
 				if ( $child !== false ) {
 					return $child;
 				}
 			}
 			if ( isset($child) && is_object($child) ) {
 				$child->_destruct();
 			}
 
 			unset($child);
 			$false = false;
 			return $false;
 		}
 
 		/**
 		 * Returns value of given child or value of it's attribute
 		 *
 		 * @param string $name
 		 * @param string $attr
 		 * @return string
 		 * @access public
 		 */
 		public function FindChildValue($name, $attr = null)
 		{
 			$child =& $this->FindChild($name);
 
 			if ( $child !== false ) {
 				if ( isset($attr) ) {
 					return $child->Attributes[ strtoupper($attr) ];
 				}
 
 				return $child->Data;
 			}
 
 			return '';
 		}
 
 		/**
 		 * Returns next node to this, false in case of end list
 		 *
 		 * @return kXMLNode
 		 */
 		function &PrevSibling()
 		{
 			if (!is_null($this->Parent) && $this->Position > 0) {
 				$pos = $this->Position - 1;
 				do {
 					$ret =& $this->Parent->GetChildByPosition($pos--);
 				} while ($ret->Name == '_TEXT_' && $pos >= 0);
 				if ($ret->Name == '_TEXT_') $ret = false;
 				return $ret;
 			}
 			else {
 				$false = false;
 				return $false;
 			}
 		}
 
 		/**
 		 * Returns next node to this, false in case of end list
 		 *
 		 * @return kXMLNode
 		 */
 		function &NextSibling()
 		{
 			if (!is_null($this->Parent)) {
 				$pos = $this->Position + 1;
 				do {
 					$ret =& $this->Parent->GetChildByPosition($pos++);
 				} while ($pos < count($this->Parent->Children) && ($ret->Name == '_TEXT_'));
 
 				if (is_object($ret) && ($ret->Name == '_TEXT_')) {
 					$ret = false;
 				}
 				return $ret;
 			}
 			else {
 				$false = false;
 				return $false;
 			}
 		}
 
 		/**
 		 * Reconstructs XML of the node and subnodes
 		 *
 		 * @param bool $content_only
 		 * @return string
 		 */
 		function GetXML($content_only = false)
 		{
 			$xml = '';
 			$single = (!$this->Data && count($this->Children) == 0);
 
 			if (!$content_only) {
 				$xml = '<'.$this->OriginalName;
 
 				if (count($this->OriginalAttributes)) {
 					$xml .= ' ';
 					$att_contents = array();
 					foreach ($this->OriginalAttributes as $name => $value) {
 						$att_contents[] = $name.'="'.kUtil::escape($value, kUtil::ESCAPE_HTML).'"';
 					}
 					$xml .= implode(' ', $att_contents);
 				}
 
 				$xml .= $single ? '/>' : '>';
 			}
 
 			if (!$single) {
 				if ($content_only) {
 					$xml .= $this->Data;
 				}
 				else {
 					$xml .= preg_match('/&|</', $this->Data) ? '<![CDATA['.$this->Data.']]>' : $this->Data;
 				}
 
 				foreach ($this->Children as $node) {
-					/* @var $node kXMLNode */
+					/** @var kXMLNode $node */
 
 					$xml .= $node->GetXML($node->Name == '_TEXT_' ? true : false);
 				}
 
 				if (!$content_only) {
 					$xml .= '</'.$this->OriginalName.'>';
 				}
 			}
 
 			return $xml;
 		}
 
 		function RemoveChild($name)
 		{
 			$child =& $this->FindChild($name);
 			$parent =& $child->Parent;
 			$pos = $child->Position;
 			array_splice($parent->Children, $pos, 1);
 			for ($i=$pos; $i < count($parent->Children); $i++) {
 				$parent->Children[$i]->Position = $i;
 			}
 			$parent->firstChild =& $parent->Children[0];
 			$parent->lastChild =& $parent->Children[count($parent->Children)-1];
 		}
 
 		function ReplaceChild($name, &$replacement)
 		{
 			$child =& $this->FindChild($name);
 			$parent =& $child->Parent;
 			$pos = $child->Position;
 			array_splice($parent->Children, $pos, 1, array($replacement));
 			$replacement->Parent =& $parent;
 			$replacement->Position = $pos;
 			$parent->firstChild =& $parent->Children[0];
 			$parent->lastChild =& $parent->Children[count($parent->Children)-1];
 		}
 
 		function SetName($name)
 		{
 			$this->Name = strtoupper($name);
 			$this->OriginalName = $name;
 		}
 
 		function SetData($data)
 		{
 			$this->Data = $data;
 		}
 
 		function SetAttribute($name, $value)
 		{
 			$this->Attributes[strtoupper($name)] = $value;
 			$this->OriginalAttributes[$name] = $value;
 		}
 	}
\ No newline at end of file
Index: branches/5.3.x/core/units/helpers/fck_helper.php
===================================================================
--- branches/5.3.x/core/units/helpers/fck_helper.php	(revision 16518)
+++ branches/5.3.x/core/units/helpers/fck_helper.php	(revision 16519)
@@ -1,641 +1,641 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class fckFCKHelper extends kHelper {
 
 	var $Config = Array();
 
 	/**
 	 * Currently selected folder
 	 *
 	 * @var string
 	 * @access protected
 	 */
 	protected $folder = '';
 
 	/**
 	 * Current sorting field
 	 *
 	 * @var string
 	 * @access protected
 	 */
 	protected $sortField = '';
 
 	/**
 	 * Current sorting direction
 	 *
 	 * @var string
 	 * @access protected
 	 */
 	protected $sortDirection = '';
 
 	public function __construct()
 	{
 		parent::__construct();
 
 		$this->folder = $this->Application->GetVar('folder');
 		$this->sortField = $this->Application->GetVar('sort_by');
 		$this->sortDirection = $this->Application->GetVar('order_by');
 
 		$this->Config['AllowedExtensions']['Files']	= Array('gif','jpeg','png','swf','fla','jpg','gif','jpeg','png','avi','mpg','mpeg','zip','rar','arj','gz','tar','doc','pdf','ppt','rdp','swf','swt','txt','vsd','xls','csv','odt');
 		$this->Config['DeniedExtensions']['Files']	= Array('php','asp','aspx','ascx','jsp','cfm','cfc','pl','bat','exe','dll','reg');
 		$this->Config['AllowedExtensions']['Images'] = Array('jpg','gif','jpeg','png', 'bmp');
 		$this->Config['DeniedExtensions']['Images']	= Array('php','asp','aspx','ascx','jsp','cfm','cfc','pl','bat','exe','dll','reg');
 		$this->Config['AllowedExtensions']['Flash']	= Array('swf','fla');
 		$this->Config['DeniedExtensions']['Flash']	= Array('php','asp','aspx','ascx','jsp','cfm','cfc','pl','bat','exe','dll','reg');
 		$this->Config['AllowedExtensions']['Media']	= Array('asf','asx','avi','wav','wax','wma','wm','wmv','m3u','mp2v','mpg','mpeg','m1v','mp2','mp3','mpa','mpe','mpv2','mp4','mid','midi','rmi','qt','aif','aifc','aiff','mov','flv','rm','svcd','swf','vcd');
 		$this->Config['DeniedExtensions']['Media']	= Array('php','asp','aspx','ascx','jsp','cfm','cfc','pl','bat','exe','dll','reg');
 		$this->Config['AllowedExtensions']['Documents']	= Array('doc','pdf','ppt','rdp','swf','swt','txt','vsd','xls','csv','zip','odt');
 		$this->Config['DeniedExtensions']['Documents']	= Array('php','asp','aspx','ascx','jsp','cfm','cfc','pl','bat','exe','dll','reg');
 
 		$this->Config['ExtensionIcons'] = Array('ai','avi','bmp','cs','dll','doc','exe','fla','gif','htm','html','jpg','js','mdb','mp3','pdf','png','ppt','rdp','swf','swt','txt','vsd','xls','xml','zip');
 	}
 
 	function CreateFolder($folder = '')
 	{
 		if ( !$folder ) {
 			return false;
 		}
 
 		$folderPath = WRITEABLE . '/user_files/' . $folder;
 
 		if ( file_exists($folderPath) && is_dir($folderPath) ) {
 			return true;
 		}
 
 		/*$permissions = defined('FCK_FOLDERS_PERMISSIONS') ? FCK_FOLDERS_PERMISSIONS : '0777';
 		return mkdir($folderPath, $permissions);*/
 
 		return mkdir($folderPath);
 	}
 
 	function IsAllowedExtension($folder, $file_name)
 	{
 		$ext = strtolower( pathinfo($file_name, PATHINFO_EXTENSION) );
 
 		if ( isset($this->Config['DeniedExtensions'][$folder]) ) {
 			if ( in_array($ext, $this->Config['DeniedExtensions'][$folder]) ) {
 				return false;
 			}
 		}
 
 		if ( isset($this->Config['AllowedExtensions'][$folder]) ) {
 			if ( !in_array($ext, $this->Config['AllowedExtensions'][$folder]) ) {
 				return false;
 			}
 		}
 
 		return true;
 	}
 
 	/**
 	 * Returns list of sub-folders from given folder (automatically excludes system folders)
 	 *
 	 * @param string $files_dir
 	 * @return Array
 	 * @access public
 	 */
 	public function ReadFolders($files_dir)
 	{
 		$ret = Array ();
 		$system_folders = defined('KERNEL_SYSTEM_FOLDERS') ? KERNEL_SYSTEM_FOLDERS : Array ('icons', 'CVS', '.svn');
 
 		try {
 			$iterator = new DirectoryIterator($files_dir);
-			/* @var $file_info DirectoryIterator */
+			/** @var DirectoryIterator $file_info */
 		}
 		catch (UnexpectedValueException $e) {
 			return $ret;
 		}
 
 		foreach ($iterator as $file_info) {
 			$filename = $file_info->getFilename();
 
 			if ( $file_info->isDir() && !$file_info->isDot() ) {
 				$ret[] = $filename;
 			}
 		}
 
 		return array_diff($ret, $system_folders);
 	}
 
 	/**
 	 * Returns list of files in given folder
 	 *
 	 * @param string $files_dir
 	 * @return Array
 	 * @access public
 	 */
 	public function ReadFiles($files_dir)
 	{
 		$ret = Array ();
 
 		try {
 			$iterator = new DirectoryIterator($files_dir);
-			/* @var $file_info DirectoryIterator */
+			/** @var DirectoryIterator $file_info */
 		}
 		catch (UnexpectedValueException $e) {
 			return $ret;
 		}
 
 		foreach ($iterator as $file_info) {
 			if ( !$file_info->isDir() ) {
 				$ret[] = $file_info->getFilename();
 			}
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Returns xml containing list of folders in current folder
 	 *
 	 * @return string
 	 * @access public
 	 */
 	public function PrintFolders()
 	{
 		$files_dir = WRITEABLE . '/user_files/' . $this->folder . '/';
 
 		$sub_folders = $this->ReadFolders($files_dir);
 		natcasesort($sub_folders);
 
 		$ret = $this->_buildFoldersXML($sub_folders, 'folder2');
 
 		if ( $this->sortField == 'name' && $this->sortDirection == '_desc' ) {
 			$sub_folders = array_reverse($sub_folders);
 		}
 
 		$ret .= $this->_buildFoldersXML($sub_folders, 'folder');
 
 		return $ret;
 	}
 
 	/**
 	 * Build XML, that will output folders for FCKEditor
 	 *
 	 * @param Array $sub_folders
 	 * @param string $xml_node
 	 * @return string
 	 */
 	protected function _buildFoldersXML($sub_folders, $xml_node)
 	{
 		$ret = '';
 
 		foreach ($sub_folders as $sub_folder) {
 			$ret .= '<' . $xml_node . ' path="' . $this->folder . "/" . $sub_folder . '">' . $sub_folder . '</' . $xml_node . '>' . "\n";
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Transforms filesize in bytes into kilobytes
 	 *
 	 * @param int $size
 	 * @return int
 	 * @access protected
 	 */
 	protected function CalculateFileSize($size)
 	{
 		if ( $size > 0 ) {
 			$size = round($size / 1024);
 			$size = ($size < 1) ? 1 : $size;
 		}
 
 		return $size;
 	}
 
 	/**
 	 * Detects icon for given file extension
 	 *
 	 * @param string $file
 	 * @return string
 	 * @access protected
 	 */
 	protected function CheckIconType($file)
 	{
 		$ext = strtolower( pathinfo($file, PATHINFO_EXTENSION) );
 
 		return $ext && in_array($ext, $this->Config['ExtensionIcons']) ? $ext : 'default.icon';
 	}
 
 	/**
 	 * Build one file xml node
 	 *
 	 * @param int $size
 	 * @param string $url
 	 * @param string $icon
 	 * @param string $date
 	 * @param string $file_name
 	 * @return string
 	 */
 	protected function _buildFileXml($size,$url,$icon,$date,$file_name)
 	{
 		return '<file size="' . $size . '" url="' . $url . '" icon="' . $icon . '" date="' . $date . '">' . $file_name . '</file>' . "\n";
 	}
 
 	/**
 	 * Returns xml containing list of files in current folder
 	 *
 	 * @return string
 	 * @access public
 	 */
 	public function PrintFiles()
 	{
 		$files_dir = WRITEABLE . '/user_files/' . $this->folder . '/';
 		$files_url = BASE_PATH . str_replace(DIRECTORY_SEPARATOR, '/', WRITEBALE_BASE) . '/user_files/' . $this->folder . '/';
 		$aFiles = $this->ReadFiles($files_dir);
 		$ret = '';
 		$date_format = "m/d/Y h:i A";
 		natcasesort($aFiles);
 
 		if ( $this->sortField == 'name' && $this->sortDirection == '_desc' ) {
 			$aFiles = array_reverse($aFiles, TRUE);
 		}
 
 		$aFilesSize = $aFilesDate = Array ();
 
 		foreach ($aFiles as $k => $v) {
 			$aFilesSize[$k] = filesize($files_dir . $v);
 			$aFilesDate[$k] = filectime($files_dir . $v);
 		}
 
 		if ( $this->sortField == 'name' ) {
 			foreach ($aFiles as $k => $file) {
 				$size = $this->CalculateFileSize($aFilesSize[$k]);
 				$date = date($date_format, $aFilesDate[$k]);
 				$icon = $this->CheckIconType($file);
 				$ret .= $this->_buildFileXml($size, $files_url . $file, $icon, $date, $file);
 			}
 		}
 
 		if ( $this->sortField == 'date' ) {
 			asort($aFilesDate);
 			if ( $this->sortDirection == '_desc' ) {
 				$aFilesDate = array_reverse($aFilesDate, TRUE);
 			}
 
 			foreach ($aFilesDate as $k => $date) {
 				$size = $this->CalculateFileSize($aFilesSize[$k]);
 				$file = $aFiles[$k];
 				$date = date($date_format, $date);
 				$icon = $this->CheckIconType($file);
 				$ret .= $this->_buildFileXml($size, $files_url . $file, $icon, $date, $file);
 			}
 		}
 
 		if ( $this->sortField == 'size' ) {
 			asort($aFilesSize);
 			if ( $this->sortDirection == '_desc' ) {
 				$aFilesSize = array_reverse($aFilesSize, TRUE);
 			}
 
 			foreach ($aFilesSize as $k => $size) {
 				$size = $this->CalculateFileSize($size);
 				$file = $aFiles[$k];
 				$date = date($date_format, $aFilesDate[$k]);
 				$icon = $this->CheckIconType($file);
 				$ret .= $this->_buildFileXml($size, $files_url . $file, $icon, $date, $file);
 			}
 		}
 
 		return $ret;
 	}
 
 	function UploadFile()
 	{
 		$upload_dir = $this->Application->GetVar('upload_dir');
 		$type = explode('/', $upload_dir);
 		$type = $type[0];
 		$sServerDir =  WRITEABLE . '/user_files/' . $upload_dir . '/';
 
 		$aUpFile = $_FILES['NewFile'];
 		$sFileName = $aUpFile['name'];
 		$sOriginalFileName = $aUpFile['name'];
 		$sExtension = strtolower(substr( $sFileName, ( strrpos($sFileName, '.') + 1 ) ) );
 		$sErrorNumber = 0;
 
 		if ( isset( $_FILES['NewFile'] ) && !is_null( $_FILES['NewFile']['tmp_name'] ) )
 		{
 			if (in_array($sExtension, $this->Config['AllowedExtensions'][$type]))
 			{
 				if (!$aUpFile['error']) {
 					$iCounter = 0 ;
 					while ( true )
 					{
 						$sFilePath = $sServerDir . $sFileName;
 						if ( is_file( $sFilePath ) )
 						{
 							$iCounter++ ;
 							$sFileName = $this->RemoveExtension( $sOriginalFileName ) . '(' . $iCounter . ').' . $sExtension;
 							$sErrorNumber = '201';
 						}
 						else
 						{
 							// Turn off all error reporting.
 							error_reporting( 0 ) ;
 
 							// Enable error tracking to catch the error.
 							ini_set( 'track_errors', '1' );
 
 							move_uploaded_file( $aUpFile['tmp_name'], $sFilePath );
 							$sErrorMsg = $php_errormsg;
 
 							// Restore the configurations.
 							ini_restore( 'track_errors' );
 							ini_restore( 'error_reporting' );
 
 							if ( is_file( $sFilePath ) ) {
 								$oldumask = umask(0);
 								chmod( $sFilePath, 0666 );
 								umask( $oldumask );
 							}
 							break ;
 						}
 					}
 				}
 			}
 			else {
 				$sErrorNumber = '203';
 			}
 		}
 		else {
 			$sErrorNumber = '202' ;
 		}
 
 		echo '<script type="text/javascript">' ;
 		echo 'window.parent.frames["frmUpload"].OnUploadCompleted(' . $sErrorNumber . ',"' . str_replace( '"', '\\"', $sFileName ) . '") ;' ;
 		echo '</script>' ;
 	}
 
 	function RemoveExtension( $fileName )
 	{
 		return substr( $fileName, 0, strrpos( $fileName, '.' ) ) ;
 	}
 
 	public function CKEditorTag($editor_name, $editor_value, $params)
 	{
 		$editor = $this->prepareConfig($this->getEditor(), $params);
 
 		$width = $this->normalizeDimension($params['width']);
 		$height = $this->normalizeDimension($params['height']);
 
 		$editor->textareaAttributes = Array (
 			'style' => 'width: ' . $width . '; height: ' . $height . ';'
 		);
 
 		$editor->config['height'] = $height; // editor area height
 
 		$events = Array (
 			'configLoaded' => 'function(ev) { CKEDITOR.addCss(ev.editor.config.extraCss); }',
 		);
 
 		return $editor->editor($editor_name, $editor_value, Array (), $events);
 	}
 
 	public function CKEditorInlineTag($editor_name, $params)
 	{
 		$editor = $this->prepareConfig($this->getEditor(), $params);
 
 		$events = Array (
 			'configLoaded' => 'function(ev) { CKEDITOR.addCss(ev.editor.config.extraCss); }',
 			'focus' => 'function(ev) { $("body").trigger("InlineEditor.Focus", [ev]); }',
 			'blur' => 'function(ev) { $("body").trigger("InlineEditor.Blur", [ev]); }',
 		);
 
 		return $editor->inline($editor_name, array('removePlugins' => 'codemirror'), $events);
 	}
 
 	/**
 	 * Adds measurement units to editor dimensions.
 	 *
 	 * @param string $dimension Dimension.
 	 *
 	 * @return string
 	 */
 	protected function normalizeDimension($dimension)
 	{
 		if ( preg_match('/^[\d]+$/', $dimension) ) {
 			$dimension .= 'px';
 		}
 
 		return $dimension;
 	}
 
 	/**
 	 * Returns editor instance.
 	 *
 	 * @return CKEditor
 	 */
 	protected function getEditor()
 	{
 		include_once(FULL_PATH . EDITOR_PATH . 'ckeditor.php');
 		$editor = new CKeditor(BASE_PATH . EDITOR_PATH);
 		$editor->returnOutput = true;
 
 		return $editor;
 	}
 
 	/**
 	 * Prepares editor config.
 	 *
 	 * @param CKEditor $editor     Editor.
 	 * @param array    $tag_params Tag params.
 	 *
 	 * @return CKEditor
 	 */
 	protected function prepareConfig(CKEditor $editor, array $tag_params)
 	{
 		$editor->lateLoad = array_key_exists('late_load', $tag_params) && $tag_params['late_load'];
 
 		list($styles_css, $styles_js) = $this->getStyles();
 
 		if ( isset($tag_params['toolbar']) ) {
 			$toolbar = $tag_params['toolbar'];
 		}
 		elseif ( isset($tag_params['mode']) && $tag_params['mode'] == 'inline' ) {
 			$toolbar = 'Inline';
 		}
 		else {
 			$toolbar = $this->Application->isDebugMode() ? 'DebugMode' : 'Default';
 		}
 
 		$editor->config = Array (
 			'toolbar' => $toolbar,
 			'baseHref' => $this->Application->BaseURL() . trim(EDITOR_PATH, '/') . '/',
 			'customConfig' => $this->getJavaScriptConfig(),
 			'stylesSet' => 'portal:' . $styles_js,
 			'contentsCss' => $styles_css,
 			'Admin' => 1, // for custom file browser to work
 			'K4' => 1, // for custom file browser to work
 			'language' => $this->getLanguage(),
 		);
 
 		$this->injectTransitParams($editor, $this->getTransitParams($tag_params));
 
 		return $editor;
 	}
 
 	/**
 	 * Transforms transit params into editor config.
 	 *
 	 * @param CKEditor $editor         Editor.
 	 * @param array    $transit_params Transit params.
 	 *
 	 * @return void
 	 */
 	protected function injectTransitParams(CKEditor $editor, array $transit_params)
 	{
 		if ( isset($transit_params['bgcolor']) && $transit_params['bgcolor'] ) {
 			$editor->config['extraCss'] = 'body { background-color: ' . $transit_params['bgcolor'] . '; }';
 		}
 
 		foreach ($transit_params as $param_name => $param_value) {
 			if ( !$param_value ) {
 				continue;
 			}
 
 			$param_key = str_replace(' ', '', ucwords(str_replace('_', ' ', $param_name)));
 			$param_key[0] = strtolower($param_key[0]);
 
 			$editor->config[$param_key] = $param_value;
 		}
 
 		if ( isset($editor->config['styleSetName']) ) {
 			$style_set_parts = explode(':', $editor->config['stylesSet']);
 			$style_set_parts[0] = $editor->config['styleSetName'];
 			$editor->config['stylesSet'] = implode(':', $style_set_parts);
 			unset($editor->config['styleSetName']);
 		}
 	}
 
 	/**
 	 * Returns url to CSS and JS style configuration.
 	 *
 	 * @return array
 	 */
 	protected function getStyles()
 	{
 		/** @var ThemeItem $theme */
 		$theme = $this->Application->recallObject('theme.current');
 		$stylesheet_file = $theme->getStylesheetFile(true);
 
 		if ( $stylesheet_file ) {
 			$stylesheet_folder_url = dirname($stylesheet_file) . '/';
 
 			$url_params = Array ('events[fck]' => 'OnGetsEditorStyles', 'no_pass_through' => 1, 'pass' => 'm');
 
 			$prefix = $this->Application->isAdmin ? '_FRONT_END_' : '';
 			$styles_css = $this->Application->HREF('index', $prefix, $url_params, 'index.php');
 
 			/** @var kCurlHelper $curl_helper */
 			$curl_helper = $this->Application->recallObject('CurlHelper');
 			$curl_helper->Send($styles_css, false);
 			$styles_css = $curl_helper->getInfo(CURLINFO_REDIRECT_URL);
 			$curl_helper->CloseConnection();
 		}
 		else {
 			$stylesheet_folder_url = $this->Application->BaseURL() . trim(EDITOR_PATH, '/') . '/';
 			$styles_css = $stylesheet_folder_url . 'style.css';
 		}
 
 		$styles_js = $stylesheet_folder_url . 'styles.js';
 
 		return array($styles_css, $styles_js);
 	}
 
 	/**
 	 * Returns url to JavaScript configuration file.
 	 *
 	 * @return string
 	 */
 	protected function getJavaScriptConfig()
 	{
 		if ( file_exists(SYSTEM_PRESET_PATH . DIRECTORY_SEPARATOR . 'inp_ckconfig.js') ) {
+			/** @var FileHelper $file_helper */
 			$file_helper = $this->Application->recallObject('FileHelper');
-			/* @var $file_helper FileHelper */
 
 			return $file_helper->pathToUrl(SYSTEM_PRESET_PATH . DIRECTORY_SEPARATOR . 'inp_ckconfig.js');
 		}
 
 		return $this->Application->BaseURL() . 'core/admin_templates/js/inp_ckconfig.js';
 	}
 
 	/**
 	 * Returns CKEditor locale, that matches default site language.
 	 *
 	 * @return string
 	 */
 	protected function getLanguage()
 	{
 		static $language_code = null;
 
 		if ( !isset($language_code) ) {
 			$language_code = 'en'; // default value
 
 			if ( $this->Application->isAdmin ) {
 				$language_id = $this->Application->Phrases->LanguageId;
 			}
 			else {
 				$language_id = $this->Application->GetDefaultLanguageId(); // $this->Application->GetVar('m_lang');
 			}
 
 			$sql = 'SELECT Locale
 					FROM ' . $this->Application->getUnitConfig('lang')->getTableName() . '
 					WHERE LanguageId = ' . $language_id;
 			$locale = strtolower($this->Conn->GetOne($sql));
 
 			if ( file_exists(FULL_PATH . EDITOR_PATH . 'editor/lang/' . $locale . '.js') ) {
 				// found language file, that exactly matches locale name (e.g. "en")
 				$language_code = $locale;
 			}
 			else {
 				$locale = explode('-', $locale);
 
 				if ( file_exists(FULL_PATH . EDITOR_PATH . 'editor/lang/' . $locale[0] . '.js') ) {
 					// language file matches first part of locale (e.g. "ru-RU")
 					$language_code = $locale[0];
 				}
 			}
 		}
 
 		return $language_code;
 	}
 
 	/**
 	 * Returns transit parameters, that should be passed to every used CKEditor instance.
 	 *
 	 * @param array $tag_params Tag params.
 	 *
 	 * @return array
 	 */
 	public function getTransitParams(array $tag_params = array())
 	{
 		$ret = array();
 		$transit_params = array('bgcolor' => '', 'body_class' => '', 'body_id' => '', 'style_set_name' => 'portal');
 
 		foreach ( $transit_params as $param_name => $default_value ) {
 			$param_value = isset($tag_params[$param_name]) ? $tag_params[$param_name] : $this->Application->GetVar($param_name);
 
 			if ( $param_value || $default_value ) {
 				$ret[$param_name] = $param_value ? $param_value : $default_value;
 			}
 		}
 
 		return $ret;
 	}
 }
Index: branches/5.3.x/core/units/helpers/skin_helper.php
===================================================================
--- branches/5.3.x/core/units/helpers/skin_helper.php	(revision 16518)
+++ branches/5.3.x/core/units/helpers/skin_helper.php	(revision 16519)
@@ -1,261 +1,261 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class SkinHelper extends kHelper {
 
 		/**
 		 * Regular expression, used to detect admin skin file among others
 		 */
 		const SKIN_REGEXP = '/admin-(.*)-([\d]+).css/';
 
 		/**
 		 * Allows to read some skin fields and build link to admin skin file.
 		 * Will automatically compile skin file, when missing.
 		 *
 		 * @param Array $params
 		 * @return string
 		 */
 		function AdminSkinTag($params)
 		{
 			if (array_key_exists('type', $params)) {
 				// returns given field of skin
 				return $this->_getStyleField( $params['type'] );
 			}
 
 			$style_info = $this->_getStyleInfo();
 
 			if (file_exists( $this->getSkinPath() )) {
 				// returns last compiled skin
 				$ret = $this->getSkinPath(true);
 			}
 			else {
 				// search for previously compiled skin
 				$last_compiled = $this->_getLastCompiled( mb_strtolower($style_info['Name']) );
 				if ($last_compiled) {
 					// found
 					$ret = $this->getSkinPath(true, $last_compiled);
 				}
 				else {
 					// not found (try to compile on the fly)
+					/** @var kDBItem $skin */
 					$skin = $this->Application->recallObject('skin.-item', null, Array ('skip_autoload' => true));
-					/* @var $skin kDBItem */
 
 					$skin->Load(1, 'IsPrimary');
 					$last_compiled = $this->compile($skin);
 					$ret = $last_compiled ? $this->getSkinPath(true, $last_compiled) : '';
 				}
 			}
 
 			if (array_key_exists('file_only', $params) && $params['file_only']) {
 				return $ret;
 			}
 
 			return '<link rel="stylesheet" rev="stylesheet" href="' . $ret . '" type="text/css" media="screen"/>';
 		}
 
 		/**
 		 * Compiles given skin object
 		 *
 		 * @param kDBItem $object
 		 */
 		function compile(&$object)
 		{
 			$ret = $object->GetDBField('CSS');
 			$options = $object->GetDBField('Options');
 			$options = unserialize($options);
 			$options['base_url'] = Array ('Value' => rtrim(BASE_PATH, '/'));
 
 			foreach ($options as $key => $row) {
 				$ret = str_replace('@@' . $key . '@@', $row['Value'], $ret);
 			}
 
 			$compile_ts = time();
 			$css_file = $this->_getStylesheetPath() . DIRECTORY_SEPARATOR . 'admin-' . mb_strtolower($object->GetDBField('Name')) . '-' . $compile_ts . '.css';
 
 			$fp = fopen($css_file, 'w');
 			if (!$fp) {
 				return false;
 			}
 
 			$prev_css = $this->_getStylesheetPath() . '/admin-' . mb_strtolower($object->GetDBField('Name')) . '-' . $object->GetDBField('LastCompiled') . '.css';
 			if (file_exists($prev_css)) {
 				unlink($prev_css);
 			}
 
 			fwrite($fp, $ret);
 			fclose($fp);
 
 			$sql = 'UPDATE ' . $object->TableName . '
 					SET LastCompiled = ' . $compile_ts . '
 					WHERE ' . $object->IDField . ' = ' . $object->GetID();
 			$this->Conn->Query($sql);
 
 			$this->Application->incrementCacheSerial('skin');
 			$this->Application->incrementCacheSerial('skin', $object->GetID());
 
 			return $compile_ts;
 		}
 
 		/**
 		 * Returns fields of primary admin skin
 		 *
 		 * @return Array
 		 * @access protected
 		 */
 		protected function _getStyleInfo()
 		{
 			$cache_key = 'primary_skin_info[%SkinSerial%]';
 			$ret = $this->Application->getCache($cache_key);
 
 			if ($ret === false) {
 				$this->Conn->nextQueryCachable = true;
 				$sql = 'SELECT *
 						FROM ' . TABLE_PREFIX . 'AdminSkins
 						WHERE IsPrimary = 1';
 				$ret = $this->Conn->GetRow($sql);
 
 				$this->Application->setCache($cache_key, $ret);
 			}
 
 			return $ret;
 		}
 
 		/**
 		 * Returns requested field value of primary admin skin
 		 *
 		 * @param string $field
 		 * @return string
 		 */
 		function _getStyleField($field)
 		{
 			if ($field == 'logo') {
 				// old style method of calling
 				$field = 'Logo';
 			}
 
 			$style_info = $this->_getStyleInfo();
 
 			if (!$style_info[$field]) {
 				return '';
 			}
 
 			$image_fields = Array ('Logo', 'LogoBottom', 'LogoLogin');
 			if (in_array($field, $image_fields)) {
 				return $this->_getStylesheetPath(true) . '/' . $style_info[$field];
 			}
 
 			return $style_info[$field];
 		}
 
 		/**
 		 * Returns path, where compiled skin and it's image files are stored
 		 *
 		 * @param bool $url
 		 * @return string
 		 * @access protected
 		 */
 		protected function _getStylesheetPath($url = false)
 		{
 			if ($url) {
 				$sub_folder = str_replace(DIRECTORY_SEPARATOR, '/', WRITEBALE_BASE) . '/user_files';
 
 				return $this->Application->BaseURL() . ltrim($sub_folder, '/');
 			}
 
 			return WRITEABLE . DIRECTORY_SEPARATOR . 'user_files';
 		}
 
 		/**
 		 * Returns full path to primary admin skin using given or last compiled date
 		 *
 		 * @param string|bool $url
 		 * @param int $compile_date
 		 * @return string
 		 * @access public
 		 */
 		public function getSkinPath($url = false, $compile_date = null)
 		{
 			$style_info = $this->_getStyleInfo();
 
 			if ( !isset($compile_date) ) {
 				$compile_date = $style_info['LastCompiled'];
 			}
 
 			$style_name = 'admin-' . mb_strtolower($style_info['Name']) . '-' . $compile_date . '.css';
 
 			return $this->_getStylesheetPath($url) . ($url ? '/' : DIRECTORY_SEPARATOR) . $style_name;
 		}
 
 		/**
 		 * Returns maximal compilation date for given skin name
 		 *
 		 * @param string $style_name
 		 * @return int
 		 */
 		function _getLastCompiled($style_name)
 		{
 			$last_compiled = 0;
 
 			$iterator = new DirectoryIterator( $this->_getStylesheetPath() . DIRECTORY_SEPARATOR );
-			/* @var $file_info DirectoryIterator */
+			/** @var DirectoryIterator $file_info */
 
 			foreach ($iterator as $file_info) {
 				if ( !$file_info->isFile() ) {
 					continue;
 				}
 
 				$regs = $this->isSkinFile( $file_info->getFilename() );
 
 				if ( $regs && $regs[1] == $style_name && $regs[2] > $last_compiled ) {
 					$last_compiled = max($last_compiled, $regs[2]);
 				}
 			}
 
 			return $last_compiled;
 		}
 
 		/**
 		 * Deletes all compiled versions of all skins
 		 *
 		 */
 		function deleteCompiled()
 		{
 			$iterator = new DirectoryIterator( $this->_getStylesheetPath() . DIRECTORY_SEPARATOR );
-			/* @var $file_info DirectoryIterator */
+			/** @var DirectoryIterator $file_info */
 
 			foreach ($iterator as $file_info) {
 				if ( $file_info->isFile() && $this->isSkinFile( $file_info->getFilename() ) ) {
 					unlink( $file_info->getPathname() );
 				}
 			}
 		}
 
 		/**
 		 * Determines if given file is admin skin file
 		 *
 		 * @param string $filename
 		 * @return array|bool
 		 * @access protected
 		 */
 		protected function isSkinFile($filename)
 		{
 			if ( preg_match(self::SKIN_REGEXP, $filename, $regs) ) {
 				return $regs;
 			}
 
 			return false;
 		}
 	}
\ No newline at end of file
Index: branches/5.3.x/core/units/helpers/geocode_helper.php
===================================================================
--- branches/5.3.x/core/units/helpers/geocode_helper.php	(revision 16518)
+++ branches/5.3.x/core/units/helpers/geocode_helper.php	(revision 16519)
@@ -1,197 +1,197 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class GeoCodeHelper extends kHelper {
 
 		/**
 		 * Returns Longitude & Latitude by US address provided
 		 *
 		 * @param string $address
 		 * @param string $city
 		 * @param string $state
 		 * @param string $zip
 		 * @return Array
 		 */
 		function QueryCoordinates($address, $city, $state, $zip)
 		{
 			$user = $this->Application->ConfigValue('GeoCodeUser');
 			$pass = $this->Application->ConfigValue('GeoCodePass');
 
 			$rie_path = sprintf(FULL_PATH.'/tools/rie/rie -u %s -p %s -g "%s" -l',
 								$user,
 								$pass,
 								$address.'|'.$city.'|'.$state.'|'.$zip
 						);
 
 			exec($rie_path, $geo_array, $code);
 
 			if ($code == 0) {
 				$out_data = explode('|', $geo_array[2]);
 
 //				include_once(FULL_PATH.'/compat/array_combine.php');
 				$assoc_data = array_combine(explode('|', $geo_array[1]), $out_data);
 
 				$lon = abs($out_data[8]); // set to positive, because required by SQL formula
 				$lat = $out_data[7];
 
 				$zip4 = $out_data[9];
 				$dpbc = $out_data[10];
 				$carrier = $out_data[11];
 			}
 			else {
 				$lon = '';
 				$lat = '';
 				$zip4 = '';
 				$dpbc = '';
 				$carrier = '';
 				$assoc_data = Array();
 			}
 
 			return Array($lon, $lat, $zip4, $dpbc, $carrier, serialize($assoc_data));
 		}
 
 		function getTag($tag, $xml)
 		{
 			$open_tag_pos = strpos($xml, '<'.$tag.'>');
 			$close_tag_pos = strpos($xml, '</'.$tag.'>');
 			if (!$open_tag_pos || !$close_tag_pos)
 			{
 				return '';
 			}
 			$tag_length = strlen($tag) + 2;
 			return substr($xml, $open_tag_pos + $tag_length, $close_tag_pos - $open_tag_pos - $tag_length);
 		}
 
 		function QueryCoordinatesFromGoogle($address, $city, $state, $zip)
 		{
 		//	1908 Pike pl, Seattle, WA
 		// http://maps.google.com/maps/geo?
 		// ABQIAAAAzNbTbxHki-PAnXzsrA7z2hR0fs2_a3JecCfKmMFhGT8VtEjV7xRV8rMK1czaEH2ZG3eiYJMuej_vnQ
 
 			$delay = 0;
 			$query_address = $address . ', ' . $city . ', ' . $state;
 
+			/** @var kCurlHelper $curl_helper */
 			$curl_helper = $this->Application->recallObject('CurlHelper');
-			/* @var $curl_helper kCurlHelper */
 
 			while ( true ) {
 				$curl_helper->SetRequestData(array(
 					'output' => 'xml',
 					'key' => $this->Application->ConfigValue('GoogleMapsKey'),
 					'q' => $query_address
 				));
 
 				$xml = $curl_helper->Send($this->Application->ConfigValue('GoogleMapsURL'));
 
 				if ( strpos($xml, '<code>620</code>') ) {
 					$delay += 100000;
 				}
 				elseif ( strpos($xml, '<code>200</code>') ) {
 					// get latitude, longitude and zip  from xml-answer
 					$a_coords = explode(',', $this->getTag('coordinates', $xml));
 					$lat = $a_coords[1];
 					$lon = abs($a_coords[0]); // set to positive, because required by SQL formula
 					$zip4 = $this->getTag('PostalCodeNumber', $xml);
 					$dpbc = '';
 					$carrier = '';
 					$assoc_data = Array();
 					break;
 				}
 				else {
 					$lon = '';
 					$lat = '';
 					$zip4 = '';
 					$dpbc = '';
 					$carrier = '';
 					$assoc_data = Array();
 					break;
 				}
 
 				usleep($delay);
 			}
 
 			return Array($lon, $lat, $zip4, $dpbc, $carrier, serialize($assoc_data));
 		}
 
 		/**
 		 * Try to find lon, lat by address return false if failed
 		 *
 		 * @param string $address
 		 * @param string $city
 		 * @param string $state
 		 * @param int $zip
 		 * @param bool $no_cache
 		 * @param bool $force_cache
 		 * @return Array|bool (lon, lat)
 		 * @access public
 		 */
 		public function GetCoordinates($address, $city, $state, $zip, $no_cache = false, $force_cache = false)
 		{
 			if ( !$zip && !$state ) {
 				// if state or zip missing then do nothing
 				return false;
 			}
 
 			$zip_info = $no_cache ? false : $this->GetFromCache($address, $city, $state, $zip);
 
 			if ( !$zip_info && !$force_cache ) {
 				list($lon, $lat, $zip4, $dpbc, $carrier, $geocode_answer) = $this->QueryCoordinatesFromGoogle($address, $city, $state, $zip);
 
 				if ( $lon != '' && $lat != '' ) {
 					// valid position returned by geocode => add to cache
 					$fields_hash = 	Array(
 						'zipcode'			=>	$zip4,
 						'address'			=>	$address,
 						'city'				=>	$city,
 						'state'				=>	$state,
 						'lat'				=>	$lat,
 						'lon'				=>	$lon,
 						'zip4'				=>	$zip4,
 						'dpbc'				=>	$dpbc,
 						'carrier'			=>	$carrier,
 						'geocode_answer'	=>	$geocode_answer,
 					);
 
 					$this->Conn->doInsert($fields_hash, TABLE_PREFIX . 'ZipCodes');
 					return Array ($lon, $lat, $zip4, $dpbc, $carrier);
 				}
 				else {
 					// bad case, rie call failed => no data retrieved
 					return false;
 				}
 			}
 
 			return Array ($zip_info['lon'], $zip_info['lat'], getArrayValue($zip_info, 'zip4'), getArrayValue($zip_info, 'dpbc'), getArrayValue($zip_info, 'carrier'));
 		}
 
 		/**
 		 * Try to find cached lon, lat by address
 		 *
 		 * @param string $address
 		 * @param string $city
 		 * @param string $state
 		 * @param int $zip
 		 * @return Array|bool (lon, lat)
 		 */
 		function GetFromCache($address, $city, $state, $zip)
 		{
 			$zip = substr($zip, 0, 5); // use only first 5 digits
 			$sql = 'SELECT lon, lat
 					FROM ' . TABLE_PREFIX . 'ZipCodes
 					WHERE zipcode = ' . $this->Conn->qstr($zip);
 			return $this->Conn->GetRow($sql);
 		}
 	}
\ No newline at end of file
Index: branches/5.3.x/core/units/helpers/search_helper.php
===================================================================
--- branches/5.3.x/core/units/helpers/search_helper.php	(revision 16518)
+++ branches/5.3.x/core/units/helpers/search_helper.php	(revision 16519)
@@ -1,838 +1,838 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class kSearchHelper extends kHelper {
 
 		/**
 		 * Perform Exact Search flag
 		 *
 		 * @var bool
 		 * @access protected
 		 */
 		protected $_performExactSearch = true;
 
 		public function __construct()
 		{
 			parent::__construct();
 
 			$this->_performExactSearch = $this->Application->ConfigValue('PerformExactSearch');
 		}
 
 		/**
 		 * Splits search phrase into keyword using quotes,plus and minus sings and spaces as split criteria
 		 *
 		 * @param string $keyword
 		 * @return Array
 		 * @access public
 		 */
 		public function splitKeyword($keyword)
 		{
 			if ( $this->Application->ConfigValue('CheckStopWords') ) {
 				$keyword_after_remove = $this->_removeStopWords($keyword);
 				if ( $keyword_after_remove ) {
 					// allow to search through stop word grid
 					$keyword = $keyword_after_remove;
 				}
 			}
 
 			$final = Array ();
 			$quotes_re = '/([+\-]?)"(.*?)"/';
 			$no_quotes_re = '/([+\-]?)([^ ]+)/';
 
 			preg_match_all($quotes_re, $keyword, $res);
 			foreach ($res[2] as $index => $kw) {
 				$final[$kw] = $res[1][$index];
 			}
 
 			$keyword = preg_replace($quotes_re, '', $keyword);
 			preg_match_all($no_quotes_re, $keyword, $res);
 
 			foreach ($res[2] as $index => $kw) {
 				$final[$kw] = $res[1][$index];
 			}
 
 			if ( $this->_performExactSearch ) {
 				foreach ($final AS $kw => $plus_minus) {
 					if ( !$plus_minus ) {
 						$final[$kw] = '+';
 					}
 				}
 			}
 
 			return $final;
 		}
 
 		function getPositiveKeywords($keyword)
 		{
 			$keywords = $this->splitKeyword($keyword);
 
 			$ret = Array();
 			foreach ($keywords as $keyword => $sign) {
 				if ($sign == '+' || $sign == '') {
 					$ret[] = $keyword;
 				}
 			}
 			return $ret;
 		}
 
 		/**
 		 * Replace wildcards to match MySQL
 		 *
 		 * @param string $keyword
 		 * @return string
 		 */
 		function transformWildcards($keyword)
 		{
 			return str_replace(Array ('%', '_', '*', '?') , Array ('\%', '\_', '%', '_'), $keyword);
 		}
 
 		function buildWhereClause($keyword, $fields)
 		{
 			$keywords = $this->splitKeyword( $this->transformWildcards($keyword) );
 
 			$normal_conditions = $plus_conditions = $minus_conditions = Array();
 
 			foreach ($keywords as $keyword => $sign) {
 				$keyword = $this->Conn->escape($keyword);
 
 				switch ($sign) {
 					case '+':
 						$plus_conditions[] = implode(" LIKE '%" . $keyword . "%' OR ", $fields) . " LIKE '%" . $keyword . "%'";
 						break;
 
 					case '-':
 						$condition = Array ();
 
 						foreach ($fields as $field) {
 							$condition[] = $field . " NOT LIKE '%" . $keyword . "%' OR " . $field . ' IS NULL';
 						}
 						$minus_conditions[] = '(' . implode(') AND (', $condition) . ')';
 						break;
 
 					case '':
 						$normal_conditions[] = implode(" LIKE '%" . $keyword . "%' OR ", $fields) . " LIKE '%" . $keyword . "%'";
 						break;
 				}
 			}
 
 			// building where clause
 			if ($normal_conditions) {
 				$where_clause = '(' . implode(') OR (', $normal_conditions) . ')';
 			}
 			else {
 				$where_clause = '1';
 			}
 
 			if ($plus_conditions) {
 				$where_clause = '(' . $where_clause . ') AND (' . implode(') AND (', $plus_conditions) . ')';
 			}
 
 			if ($minus_conditions) {
 				$where_clause = '(' . $where_clause . ') AND (' . implode(') AND (', $minus_conditions) . ')';
 			}
 
 			return $where_clause;
 		}
 
 		/**
 		 * Returns additional information about search field
 		 *
 		 * @param kDBList $object
 		 * @param string $field_name
 		 * @return Array
 		 */
 		function _getFieldInformation(&$object, $field_name)
 		{
 			$sql_filter_type = $object->isVirtualField($field_name) ? 'having' : 'where';
 			$field_options = $object->GetFieldOptions($field_name);
 
 			$table_name = '';
 			$field_type = isset($field_options['type']) ? $field_options['type'] : 'string';
 
 			if (preg_match('/(.*)\.(.*)/', $field_name, $regs)) {
 				$table_name = '`'.$regs[1].'`.'; // field from external table
 				$field_name = $regs[2];
 			}
 			elseif ($sql_filter_type == 'where') {
 				$table_name = '`'.$object->TableName.'`.'; // field from local table
 			}
 
 			$table_name = ($sql_filter_type == 'where') ? $table_name : '';
 
 			// replace wid inside table name to WID_MARK constant value
 			$is_temp_table = preg_match('/(.*)'.TABLE_PREFIX.'ses_'.$this->Application->GetSID().'(_[\d]+){0,1}_edit_(.*)/', $table_name, $regs);
 			if ($is_temp_table) {
 				$table_name = $regs[1].TABLE_PREFIX.'ses_'.EDIT_MARK.'_edit_'.$regs[3]; // edit_mark will be replaced with sid[_main_wid] in AddFilters
 			}
 
 			return Array ($field_name, $field_type, $table_name, $sql_filter_type);
 		}
 
 		/**
 		 * Removes stop words from keyword
 		 *
 		 * @param string $keyword
 		 * @return string
 		 */
 		function _removeStopWords($keyword)
 		{
 			static $stop_words = Array ();
 
 			if (!$stop_words) {
 				$sql = 'SELECT StopWord
 						FROM ' . $this->Application->getUnitConfig('stop-word')->getTableName() . '
 						ORDER BY LENGTH(StopWord) DESC, StopWord ASC';
 				$stop_words = $this->Conn->GetCol($sql);
 
 				foreach ($stop_words as $index => $stop_word) {
 					$stop_words[$index] = '/(^| )' . preg_quote($stop_word, '/') . '( |$)/';
 				}
 			}
 
 			$keyword = preg_replace($stop_words, ' ', $keyword);
 
 			return trim( preg_replace('/[ ]+/', ' ', $keyword) );
 		}
 
 		/**
 		 * Performs new search on a given grid
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access public
 		 */
 		public function performSearch($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			// process search keyword
 			$search_keyword = $this->Application->GetVar($event->getPrefixSpecial(true) . '_search_keyword');
 			$this->Application->StoreVar($event->getPrefixSpecial() . '_search_keyword', $search_keyword);
 
 			$custom_filter = $this->processCustomFilters($event);
 
 			if ( !$search_keyword && $custom_filter === false ) {
 				$this->resetSearch($event);
 				return ;
 			}
 
 			if ( $search_keyword ) {
 				$this->processAutomaticFilters($event, $search_keyword, $custom_filter);
 			}
 		}
 
 		/**
 		 * Creates filtering sql clauses based on given search restrictions
 		 *
 		 * @param kEvent $event
 		 * @param string $search_keyword
 		 * @param Array $custom_filter
 		 * @return void
 		 */
 		function processAutomaticFilters($event, $search_keyword, $custom_filter)
 		{
 			$grid_name = $this->Application->GetVar('grid_name');
 			$grid = $event->getUnitConfig()->getGridByName($grid_name);
 			$search_fields = array_keys($grid['Fields']);
 
 			$search_filter = Array();
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			foreach ($search_fields as $search_field) {
 				$custom_search = isset($custom_filter[$search_field]);
 
 				$filter_data = $this->getSearchClause($object, $search_field, $search_keyword, $custom_search);
 
 				if ($filter_data) {
 					$search_filter[$search_field] = $filter_data;
 				}
 				else {
 					unset($search_filter[$search_field]);
 				}
 			}
 			$this->Application->StoreVar($event->getPrefixSpecial().'_search_filter', serialize($search_filter) );
 		}
 
 		/**
 		 * Returns search clause for any particular field
 		 *
 		 * @param kDBList $object
 		 * @param string $field_name
 		 * @param string $search_keyword what we are searching (false, when building custom filter clause)
 		 * @param string $custom_search already found using custom filter
 		 * @return Array
 		 */
 		function getSearchClause(&$object, $field_name, $search_keyword, $custom_search)
 		{
 			if ($object->isVirtualField($field_name) && !$object->isCalculatedField($field_name)) {
 				// Virtual field, that is shown in grid, but it doesn't have corresponding calculated field.
 				// Happens, when field value is calculated on the fly (during grid display) and it is not searchable.
 				return '';
 			}
 
 			$search_keywords = $this->splitKeyword($search_keyword);
 
 			list ($field_name, $field_type, $table_name, $sql_filter_type) = $this->_getFieldInformation($object, $field_name);
 
 			$filter_value = '';
 
 			// get field clause by formatter name and/or parameters
 			$field_options = $object->GetFieldOptions($field_name);
 			$formatter = getArrayValue($field_options, 'formatter');
 
 			switch ($formatter) {
 				case 'kOptionsFormatter':
 					$search_keys = Array();
 
 					if ($custom_search === false) {
 						// if keywords passed through simple search filter (on each grid)
 						$use_phrases = getArrayValue($field_options, 'use_phrases');
 						$multiple = array_key_exists('multiple', $field_options) && $field_options['multiple'];
 
 						foreach ($field_options['options'] as $key => $val) {
 							$match_to = mb_strtolower($use_phrases ? $this->Application->Phrase($val) : $val);
 
 							foreach ($search_keywords as $keyword => $sign) {
 								// doesn't support wildcards
 								if (strpos($match_to, mb_strtolower($keyword)) === false) {
 									if ($sign == '+') {
 										$filter_value = $table_name.'`'.$field_name.'` = NULL';
 										break;
 									}
 									else {
 										continue;
 									}
 								}
 
 								if ($sign == '+' || $sign == '') {
 									// don't add single quotes to found option ids when multiselect (but escape string anyway)
 									$search_keys[$key] = $multiple ? $this->Conn->escape($key) : $this->Conn->qstr($key);
 								}
 								elseif($sign == '-') {
 									// if same value if found as exclusive too, then remove from search result
 									unset($search_keys[$key]);
 								}
 							}
 						}
 					}
 
 					if ($search_keys) {
 						if ($multiple) {
 							$filter_value = $table_name.'`'.$field_name.'` LIKE "%|' . implode('|%" OR ' . $table_name.'`'.$field_name.'` LIKE "%|', $search_keys) . '|%"';
 						}
 						else {
 							$filter_value = $table_name.'`'.$field_name.'` IN ('.implode(',', $search_keys).')';
 						}
 					}
 
 					$field_processed = true;
 					break;
 
 				case 'kDateFormatter':
 					// if date is searched using direct filter, then do nothing here, otherwise search using LIKE clause
 					$field_processed = ($custom_search !== false) ? true : false;
 					break;
 
 				default:
 					$field_processed = false;
 					break;
 			}
 
 			// if not already processed by formatter, then get clause by field type
 			if (!$field_processed && $search_keywords) {
 				switch($field_type)
 				{
 					case 'int':
 					case 'integer':
 					case 'numeric':
 						$search_keys = Array();
 						foreach ($search_keywords as $keyword => $sign) {
 							if (!is_numeric($keyword) || ($sign == '-')) {
 								continue;
 							}
 							$search_keys[] = $this->Conn->qstr($keyword);
 						}
 
 						if ($search_keys) {
 							$filter_value = $table_name.'`'.$field_name.'` IN ('.implode(',', $search_keys).')';
 						}
 						break;
 
 					case 'double':
 					case 'float':
 					case 'real':
 						$search_keys = Array();
 						foreach ($search_keywords as $keyword => $sign) {
 							$keyword = str_replace(',', '.', $keyword);
 							if (!is_numeric($keyword) || ($sign == '-')) continue;
 							$search_keys[] = 'ABS('.$table_name.'`'.$field_name.'` - '.$this->Conn->qstr($keyword).') <= 0.0001';
 						}
 
 						if ($search_keys) {
 							$filter_value = '('.implode(') OR (', $search_keys).')';
 						}
 						break;
 
 					case 'string':
 						$filter_value = $this->buildWhereClause($search_keyword, Array($table_name.'`'.$field_name.'`'));
 						break;
 				}
 			}
 
 			if ($filter_value) {
 				return Array('type' => $sql_filter_type, 'value' => $filter_value);
 			}
 
 			return false;
 		}
 
 		/**
 		 * Processes custom filters from submit
 		 *
 		 * @param kEvent $event
 		 * @return Array|bool
 		 */
 		function processCustomFilters($event)
 		{
 			$grid_name = $this->Application->GetVar('grid_name');
 
 			// update "custom filter" with values from submit: begin
 			$view_name = $this->Application->RecallVar($event->getPrefixSpecial().'_current_view');
 			$custom_filters = $this->Application->RecallPersistentVar($event->getPrefixSpecial().'_custom_filter.'.$view_name/*, ALLOW_DEFAULT_SETTINGS*/);
 			if ($custom_filters) {
 				$custom_filters = unserialize($custom_filters);
 				$custom_filter = isset($custom_filters[$grid_name]) ? $custom_filters[$grid_name] : Array ();
 			}
 			else {
 				$custom_filter = Array ();
 			}
 
 			// submit format custom_filters[prefix_special][field]
 			$submit_filters = $this->Application->GetVar('custom_filters');
 			if ($submit_filters) {
 				$submit_filters = getArrayValue($submit_filters, $event->getPrefixSpecial(), $grid_name);
 				if ($submit_filters) {
 					foreach ($submit_filters as $field_name => $field_options) {
 						list ($filter_type, $field_value) = each($field_options);
 						$is_empty = strlen(is_array($field_value) ? implode('', $field_value) : $field_value) == 0;
 						if ($is_empty) {
 							if (isset($custom_filter[$field_name])) {
 								// use isset, because non-existing key will cause "php notice"!
 								unset($custom_filter[$field_name][$filter_type]); // remove filter
 
 								if (!$custom_filter[$field_name]) {
 									// if no filters left for field, then delete record at all
 									unset($custom_filter[$field_name]);
 								}
 							}
 						}
 						else {
 							$custom_filter[$field_name][$filter_type]['submit_value'] = $field_value;
 						}
 					}
 				}
 			}
 
 			if ($custom_filter) {
 				$custom_filters[$grid_name] = $custom_filter;
 			}
 			else {
 				unset($custom_filters[$grid_name]);
 			}
 			// update "custom filter" with values from submit: end
 
 			if (!$custom_filter) {
 				// in case when no filters specified, there are nothing to process
 				$this->Application->StorePersistentVar($event->getPrefixSpecial().'_custom_filter.'.$view_name, serialize($custom_filters) );
 				return false;
 			}
 
 			$object = $event->getObject(); // don't recall it each time in getCustomFilterSearchClause
 			$grid_info = $event->getUnitConfig()->getGridByName($grid_name);
 
 			foreach ($custom_filter as $field_name => $field_options) {
 				list ($filter_type, $field_options) = each($field_options);
 				$field_options['grid_options'] = $grid_info['Fields'][$field_name];
 				$field_options = $this->getCustomFilterSearchClause($object, $field_name, $filter_type, $field_options);
 				if ($field_options['value']) {
 					unset($field_options['grid_options']);
 					$custom_filter[$field_name][$filter_type] = $field_options;
 				}
 			}
 
 			$custom_filters[$grid_name] = $custom_filter;
 			$this->Application->StorePersistentVar($event->getPrefixSpecial().'_custom_filter.'.$view_name, serialize($custom_filters) );
 			return $custom_filter;
 		}
 
 		/**
 		 * Checks, that range filters "To" part is defined for given grid
 		 *
 		 * @param string $prefix_special
 		 * @param string $grid_name
 		 * @return bool
 		 */
 		function rangeFiltersUsed($prefix_special, $grid_name)
 		{
 			static $cache = Array ();
 			$cache_key = $prefix_special . $grid_name;
 
 			if (array_key_exists($cache_key, $cache)) {
 				return $cache[$cache_key];
 			}
 
 			$view_name = $this->Application->RecallVar($prefix_special . '_current_view');
 			$custom_filters = $this->Application->RecallPersistentVar($prefix_special . '_custom_filter.' . $view_name/*, ALLOW_DEFAULT_SETTINGS*/);
 			if (!$custom_filters) {
 				// filters not defined for given prefix
 				$cache[$cache_key] = false;
 				return false;
 			}
 
 			$custom_filters = unserialize($custom_filters);
 			if (!is_array($custom_filters) || !array_key_exists($grid_name, $custom_filters)) {
 				// filters not defined for given grid
 				$cache[$cache_key] = false;
 				return false;
 			}
 
 			$range_filter_defined = false;
 
 			$custom_filter = $custom_filters[$grid_name];
 			foreach ($custom_filter as $field_name => $field_options) {
 				list ($filter_type, $field_options) = each($field_options);
 
 				if (strpos($filter_type, 'range') === false) {
 					continue;
 				}
 
 				$to_value = (string)$field_options['submit_value']['to'];
 				if ($to_value !== '') {
 					$range_filter_defined = true;
 					break;
 				}
 			}
 
 			$cache[$cache_key] = $range_filter_defined;
 			return $range_filter_defined;
 		}
 
 		/**
 		 * Return numeric range filter value + checking that it's number
 		 *
 		 * @param Array $value array containing range filter value
 		 * @return unknown
 		 */
 		function getRangeValue($value)
 		{
 			// fix user typing error, since MySQL only sees "." as decimal separator
 			$value = str_replace(',', '.', $value);
 
 			return strlen($value) && is_numeric($value) ? $this->Conn->qstr($value) : false;
 		}
 
 		/**
 		 * Returns filter clause
 		 *
 		 * @param kDBItem $object
 		 * @param string $field_name
 		 * @param string $filter_type
 		 * @param Array $field_options
 		 * @return Array
 		 */
 		function getCustomFilterSearchClause(&$object, $field_name, $filter_type, $field_options)
 		{
 			// this is usually used for mutlilingual fields and date fields
 			if (isset($field_options['grid_options']['sort_field'])) {
 				$field_name = $field_options['grid_options']['sort_field'];
 			}
 			list ($field_name, $field_type, $table_name, $sql_filter_type) = $this->_getFieldInformation($object, $field_name);
 
 			$filter_value = '';
 
 			switch ($filter_type) {
 				case 'range':
 					$from = $this->getRangeValue($field_options['submit_value']['from']);
 					$to = $this->getRangeValue($field_options['submit_value']['to']);
 
 					if ( $from !== false && $to !== false ) {
 						// add range filter
 						$filter_value = $table_name . '`' . $field_name . '` >= ' . $from . ' AND ' . $table_name . '`' . $field_name . '` <= ' . $to;
 					}
 					elseif ( $field_type == 'int' || $field_type == 'integer' ) {
 						if ( $from !== false ) {
 							// add equals filter on $from
 							$filter_value = $table_name . '`' . $field_name . '` = ' . $from;
 						}
 						elseif ( $to !== false ) {
 							// add equals filter on $to
 							$filter_value = $table_name . '`' . $field_name . '` = ' . $to;
 						}
 					}
 					else {
 						// MySQL can't compare values in "float" type columns using "=" operator
 						if ( $from !== false ) {
 							// add equals filter on $from
 							$filter_value = 'ABS(' . $table_name . '`' . $field_name . '` - ' . $from . ') <= 0.0001';
 						}
 						elseif ( $to !== false ) {
 							// add equals filter on $to
 							$filter_value = 'ABS(' . $table_name . '`' . $field_name . '` - ' . $to . ') <= 0.0001';
 						}
 					}
 					break;
 
 				case 'date_range':
 					$from = $this->processRangeField($object, $field_name, $field_options['submit_value'], 'from');
 					$to = $this->processRangeField($object, $field_name, $field_options['submit_value'], 'to');
 
 					$day_seconds = 23 * 60 * 60 + 59 * 60 + 59;
 					if ($from !== false && $to === false) {
 						$from = strtotime(date('Y-m-d', $from) . ' 00:00:00', $from); // reset to morning
 						$to = $from + $day_seconds;
 					}
 					elseif ($from === false && $to !== false) {
 						$to = strtotime(date('Y-m-d', $to) . ' 23:59:59', $to); // reset to evening
 						$from = $to - $day_seconds;
 					}
 
 					if ($from !== false && $to !== false) {
 						$filter_value = $table_name.'`'.$field_name.'` >= '.$from.' AND '.$table_name.'`'.$field_name.'` <= '.$to;
 					}
 					break;
 
 				case 'equals':
 				case 'options':
 					$field_value = strlen($field_options['submit_value']) ? $this->Conn->qstr($field_options['submit_value']) : false;
 					if ($field_value) {
 						$filter_value = $table_name.'`'.$field_name.'` = '.$field_value;
 					}
 					break;
 
 				case 'picker':
 					$field_value = strlen($field_options['submit_value']) ? $this->Conn->escape($field_options['submit_value']) : false;
 					if ($field_value) {
 						$filter_value = $table_name.'`'.$field_name.'` LIKE "%|'.$field_value.'|%"';
 					}
 					break;
 
 				case 'multioptions':
 					$field_value = $field_options['submit_value'];
 
 					if ( $field_value ) {
 						$field_value = explode('|', substr($field_value, 1, -1));
 						$multiple = $object->GetFieldOption($field_name, 'multiple');
 						$field_value = $this->Conn->qstrArray($field_value, $multiple ? 'escape' : 'qstr');
 
 						if ( $multiple ) {
 							$filter_value = $table_name . '`' . $field_name . '` LIKE "%|' . implode('|%" OR ' . $table_name . '`' . $field_name . '` LIKE "%|', $field_value) . '|%"';
 						}
 						else {
 							$filter_value = $table_name . '`' . $field_name . '` IN (' . implode(',', $field_value) . ')';
 						}
 					}
 					break;
 
 				case 'like':
 					$filter_value = $this->buildWhereClause($field_options['submit_value'], Array($table_name.'`'.$field_name.'`'));
 					break;
 
 				default:
 					break;
 			}
 
 			$field_options['sql_filter_type'] = $sql_filter_type;
 			$field_options['value'] = $filter_value;
 
 			return $field_options;
 		}
 
 		/**
 		 * Enter description here...
 		 *
 		 * @param kdbItem $object
 		 * @param string $search_field
 		 * @param string $value
 		 * @param string $type
 		 */
 		function processRangeField(&$object, $search_field, $value, $type)
 		{
 			if ( !strlen($value[$type]) ) {
 				return false;
 			}
 
 			$options = $object->GetFieldOptions($search_field);
 			$dt_separator = array_key_exists('date_time_separator', $options) ? $options['date_time_separator'] : ' ';
 			$value[$type] = trim($value[$type], $dt_separator); // trim any
 
 			$tmp_value = explode($dt_separator, $value[$type], 2);
 			if ( count($tmp_value) == 1 ) {
 				$time_format = $this->_getInputTimeFormat($options);
 				if ( $time_format ) {
 					// time is missing, but time format available -> guess time and add to date
 					$time = ($type == 'from') ? mktime(0, 0, 0) : mktime(23, 59, 59);
 					$time = date($time_format, $time);
 					$value[$type] .= $dt_separator . $time;
 				}
 			}
 
+			/** @var kFormatter $formatter */
 			$formatter = $this->Application->recallObject($options['formatter']);
-			/* @var $formatter kFormatter */
 
 			$value_ts = $formatter->Parse($value[$type], $search_field, $object);
 
 			if ( $object->GetErrorPseudo($search_field) ) {
 				// invalid format -> ignore this date in search
 				$object->RemoveError($search_field);
 
 				return false;
 			}
 
 			return $value_ts;
 		}
 
 		/**
 		 * Returns InputTimeFormat using given field options
 		 *
 		 * @param Array $field_options
 		 * @return string
 		 */
 		function _getInputTimeFormat($field_options)
 		{
 			if ( array_key_exists('input_time_format', $field_options) ) {
 				return $field_options['input_time_format'];
 			}
 
+			/** @var LanguagesItem $lang_current */
 			$lang_current = $this->Application->recallObject('lang.current');
-			/* @var $lang_current LanguagesItem */
 
 			return $lang_current->GetDBField('InputTimeFormat');
 		}
 
 		/**
 		 * Resets current search
 		 *
 		 * @param kEvent $event
 		 */
 		function resetSearch($event)
 		{
 			$this->Application->RemoveVar($event->getPrefixSpecial().'_search_filter');
 			$this->Application->RemoveVar($event->getPrefixSpecial().'_search_keyword');
 
 			$view_name = $this->Application->RecallVar($event->getPrefixSpecial().'_current_view');
 			$this->Application->RemovePersistentVar($event->getPrefixSpecial().'_custom_filter.'.$view_name);
 		}
 
 		/**
 		 * Creates filters based on "types" & "except" parameters from PrintList
 		 *
 		 * @param kEvent $event
 		 * @param Array $type_clauses
 		 * @param string $types
 		 * @param string $except_types
 		 */
 		function SetComplexFilter($event, &$type_clauses, $types, $except_types)
 		{
+			/** @var kMultipleFilter $includes_or_filter */
 			$includes_or_filter = $this->Application->makeClass('kMultipleFilter', Array (kDBList::FLT_TYPE_OR));
-			/* @var $includes_or_filter kMultipleFilter */
 
+			/** @var kMultipleFilter $excepts_and_filter */
 			$excepts_and_filter = $this->Application->makeClass('kMultipleFilter', Array (kDBList::FLT_TYPE_AND));
-			/* @var $excepts_and_filter kMultipleFilter */
 
+			/** @var kMultipleFilter $includes_or_filter_h */
 			$includes_or_filter_h = $this->Application->makeClass('kMultipleFilter', Array (kDBList::FLT_TYPE_OR));
-			/* @var $includes_or_filter_h kMultipleFilter */
 
+			/** @var kMultipleFilter $excepts_and_filter_h */
 			$excepts_and_filter_h = $this->Application->makeClass('kMultipleFilter', Array (kDBList::FLT_TYPE_AND));
-			/* @var $excepts_and_filter_h kMultipleFilter */
 
 			if ( $types ) {
 				$types = explode(',', $types);
 
 				foreach ($types as $type) {
 					$type = trim($type);
 
 					if ( isset($type_clauses[$type]) ) {
 						if ( $type_clauses[$type]['having_filter'] ) {
 							$includes_or_filter_h->addFilter('filter_' . $type, $type_clauses[$type]['include']);
 						}
 						else {
 							$includes_or_filter->addFilter('filter_' . $type, $type_clauses[$type]['include']);
 						}
 					}
 				}
 			}
 
 			if ( $except_types ) {
 				$except_types = explode(',', $except_types);
 				foreach ($except_types as $type) {
 					$type = trim($type);
 
 					if ( isset($type_clauses[$type]) ) {
 						if ( $type_clauses[$type]['having_filter'] ) {
 							$excepts_and_filter_h->addFilter('filter_' . $type, $type_clauses[$type]['except']);
 						}
 						else {
 							$excepts_and_filter->addFilter('filter_' . $type, $type_clauses[$type]['except']);
 						}
 					}
 				}
 			}
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			$object->addFilter('includes_filter', $includes_or_filter);
 			$object->addFilter('excepts_filter', $excepts_and_filter);
 
 			$object->addFilter('includes_filter_h', $includes_or_filter_h, kDBList::HAVING_FILTER);
 			$object->addFilter('excepts_filter_h', $excepts_and_filter_h, kDBList::HAVING_FILTER);
 		}
 
 		/**
 		 * Ensures empty search table
 		 *
 		 * @return void
 		 */
 		public function ensureEmptySearchTable()
 		{
 			$search_table = $this->getSearchTable();
 			$this->Conn->Query('DROP TABLE IF EXISTS ' . $search_table);
 			$sql = 'CREATE TABLE ' . $search_table . ' (
 					  `Relevance` decimal(8,5) DEFAULT NULL,
 					  `ItemId` int(11) NOT NULL DEFAULT 0,
 					  `ResourceId` int(11) DEFAULT NULL,
 					  `ItemType` int(1) NOT NULL DEFAULT 0,
 					  `EdPick` tinyint(4) NOT NULL DEFAULT 0,
 					  KEY `ResourceId` (`ResourceId`),
 					  KEY `Relevance` (`Relevance`)
 					)';
 			$this->Conn->Query($sql);
 		}
 
 		/**
 		 * Search table name
 		 *
 		 * @return string
 		 */
 		public function getSearchTable()
 		{
 			return TABLE_PREFIX . 'ses_' . $this->Application->GetSID() . '_' . TABLE_PREFIX . 'Search';
 		}
 
 	}
Index: branches/5.3.x/core/units/helpers/ajax_form_helper.php
===================================================================
--- branches/5.3.x/core/units/helpers/ajax_form_helper.php	(revision 16518)
+++ branches/5.3.x/core/units/helpers/ajax_form_helper.php	(revision 16519)
@@ -1,151 +1,151 @@
 <?php
 
 	class AjaxFormHelper extends kHelper {
 
 		/**
 		 * Sets error info as parameters in response object
 		 * Expects that event status is not erSUCCESS
 		 *
 		 * @param kEvent $event
 		 * @param Array $response
 		 */
 		public function prepareJSONErrors($event, &$response)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$response['status'] = 'FAILED';
 			$response['field_errors'] = $this->getErrorMessages($object);
 		}
 
 		/**
 		 * Returns object errors
 		 *
 		 * @param kDBItem $object
 		 * @return Array
 		 */
 		public function getErrorMessages(&$object)
 		{
 			$error_msgs = Array ();
 			$field_errors = array_keys( $object->GetFieldErrors() );
 
 			foreach ($field_errors as $field) {
 				if ( !$object->GetErrorPseudo($field) ) {
 					continue;
 				}
 
 				if ( $object->GetFieldOption($field, 'formatter') == 'kMultiLanguage') {
 					$field = 'l' . $this->Application->GetVar('m_lang') . '_' . $field;
 				}
 
 				$error_field = $object->GetFieldOption($field, 'error_field', false, $field);
 				$error_msgs[$field] = $object->GetErrorMsg($error_field, false);
 			}
 
 			return $error_msgs;
 		}
 
 		/**
 		 * Returns information about all uploader fields.
 		 *
 		 * @param kDBItem $object Object to process
 		 * @param array|null $fields Fields filter.
 		 *
 		 * @return array
 		 * @access public
 		 */
 		public function getUploaderInfo(kDBItem $object, $fields = null)
 		{
 			$ret = array();
 
 			if ( !isset($fields) ) {
 				$fields = array_keys($object->getFields());
 			}
 
 			foreach ($fields as $field) {
 				$formatter = $object->GetFieldOption($field, 'formatter');
 
 				if ( !$formatter ) {
 					continue;
 				}
 
 				if ( $formatter == 'kUploadFormatter' || in_array('kUploadFormatter', class_parents($formatter)) ) {
 					$ret[$field] = array(
 						'urls' => $object->GetField($field, 'file_urls'),
 						'names' => $object->GetField($field, 'file_names'),
 						'sizes' => $object->GetField($field, 'file_sizes'),
 					);
 				}
 			}
 
 			return $ret;
 		}
 
 		/**
 		 * Sends JSON-encoded response as event result to the browser
 		 *
 		 * @param kEvent $event
 		 * @param Array $response
 		 */
 		public function sendResponse($event, $response = Array ())
 		{
 			if ( !isset($response['status']) ) {
 				$response['status'] = 'OK';
 			}
 
+			/** @var JSONHelper $json_helper */
 			$json_helper = $this->Application->recallObject('JSONHelper');
-			/* @var $json_helper JSONHelper */
 
 			echo $json_helper->encode($response);
 
 			$event->status = kEvent::erSTOP;
 		}
 
 		/**
 		 * Calls given event and returns nice JSON output
 		 *
 		 * @param kEvent $event
 		 * @param string $call_event
 		 * @param Array $params
 		 * @param Closure $callback
 		 * @return bool
 		 * @access public
 		 */
 		public function transitEvent($event, $call_event, $params = Array (), $callback = null)
 		{
 			$params['status'] = 'OK';
 			$event->CallSubEvent($call_event);
 
 			$form_data = $event->getEventParam('form_data');
 
 			if ( $form_data !== false ) {
+				/** @var kDBItem $object */
 				$object = $event->getObject();
-				/* @var $object kDBItem */
 
 				$params['uploader_info'] = $this->getUploaderInfo($object, array_keys($form_data));
 			}
 
 			if ( is_callable($callback) ) {
 				call_user_func($callback, $event);
 			}
 
 			if ( $event->status != kEvent::erSUCCESS ) {
 				$this->prepareJSONErrors($event, $params);
 			}
 			else {
 				if ( !isset($params['redirect_to']) && ($event->redirect === true || strlen($event->redirect) > 0) ) {
 					if ( $event->redirect === true ) {
 						$event->redirect = '';
 					}
 
 					$params['redirect_to'] = $this->Application->HREF($event->redirect, '', $event->getRedirectParams(), $event->redirectScript);
 				}
 
 				$params = array_merge($params, $event->getRedirectParams());
 			}
 
 			$this->sendResponse($event, $params);
 
 			return $params['status'] == 'OK';
 		}
 	}
Index: branches/5.3.x/core/units/helpers/mailing_list_helper.php
===================================================================
--- branches/5.3.x/core/units/helpers/mailing_list_helper.php	(revision 16518)
+++ branches/5.3.x/core/units/helpers/mailing_list_helper.php	(revision 16519)
@@ -1,386 +1,386 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class MailingListHelper extends kHelper {
 
 		var $_mailingId = false;
 
 		/**
 		 * Adds new email from given mailing to emails queue
 		 *
 		 * @param string $email
 		 * @param int $mailing_id
 		 * @param Array $mailing_data
 		 */
 		function queueEmail($email, $mailing_id, &$mailing_data)
 		{
+			/** @var kEmailSendingHelper $esender */
 			$esender = $this->Application->recallObject('EmailSender');
-			/* @var $esender kEmailSendingHelper */
 
 			if ($this->_mailingId != $mailing_id) {
 				if (is_numeric($this->_mailingId)) {
 					// clear fields after previous mailing processing
 					$esender->Clear();
 				}
 
 				// 1. set headers same for all emails
 				list ($mailing_data['FromName'], $mailing_data['FromEmail']) = $this->_getSenderData($mailing_data);
 				$esender->SetFrom($mailing_data['FromEmail'], $mailing_data['FromName']);
 
 				$esender->SetSubject($mailing_data['Subject']);
 				if ( !$mailing_data['MessageText'] ) {
 					$mailing_data['MessageText'] = $esender->ConvertToText($mailing_data['MessageHtml']);
 				}
 
 				$esender->SetBody($mailing_data['MessageHtml'], $mailing_data['MessageText']);
 
 		    	// 2. add attachment if any
 		    	$attachments = $mailing_data['Attachments'] ? explode('|', $mailing_data['Attachments']) : Array ();
 
 				foreach ($attachments as $attachment) {
 					$esender->AddAttachment(FULL_PATH . ITEM_FILES_PATH . $attachment);
 				}
 
 				$this->_mailingId = $mailing_id;
 			}
 
 			// 3. set recipient specific fields
 			$esender->SetTo($email, $email);
 
 			if ( $this->Application->ConfigValue('EnableEmailLog') ) {
 				// 4. write to log
 				$log_fields_hash = Array (
 					'From' => $mailing_data['FromName'] . '(' . $mailing_data['FromEmail'] . ')',
 					'To' => $email,
 					'Subject' => $mailing_data['Subject'],
 					'HtmlBody' => $mailing_data['MessageHtml'],
 					'TextBody' => $mailing_data['MessageText'],
 					'SentOn' => TIMENOW,
 					'EventParams' => serialize( Array ('MailingId' => $mailing_id) ),
 				);
 
 				$esender->setLogData($log_fields_hash);
 			}
 
 			$esender->Deliver(null, $mailing_id, false);
 		}
 
 		/**
 		 * Returns mass mail sender name & email
 		 *
 		 * @param Array $mailing_data
 		 * @return Array
 		 * @access protected
 		 */
 		protected function _getSenderData(&$mailing_data)
 		{
 			$is_root = true;
 			$email_address = $name = '';
 
 			if ( $mailing_data['PortalUserId'] > 0 ) {
+				/** @var UsersItem $sender */
 				$sender = $this->Application->recallObject('u.-item', null, Array ('skip_autoload' => true));
-				/* @var $sender UsersItem */
 
 				$sender->Load($mailing_data['PortalUserId']);
 
 				$email_address = $sender->GetDBField('Email');
 				$name = trim($sender->GetDBField('FirstName') . ' ' . $sender->GetDBField('LastName'));
 				$is_root = false;
 			}
 
 			if ( $is_root || !$email_address ) {
 				$email_address = $this->Application->ConfigValue('DefaultEmailSender');
 			}
 
 			if ( $is_root || !$name ) {
 				$name = strip_tags($this->Application->ConfigValue('Site_Name'));
 			}
 
 			return Array ($name, $email_address);
 		}
 
 		/**
 		 * Generates recipients emails based on "To" field value.
 		 *
 		 * @param int   $id          Id.
 		 * @param Array $fields_hash Fields hash.
 		 *
 		 * @return array
 		 */
 		function generateRecipients($id, $fields_hash)
 		{
 			// for each group convert ids to names
 			$recipient_emails = Array ();
 			$recipients_grouped = $this->groupRecipientsByType(explode(';', $fields_hash['To']));
 
 			foreach ($recipients_grouped as $recipient_type => $group_recipients) {
 				$recipient_emails = array_merge($recipient_emails, $this->_getRecipientEmails($recipient_type, $group_recipients));
 			}
 
 			$recipient_emails = array_unique($recipient_emails);
 
 			return Array (
 				'ToParsed' => serialize($recipient_emails),
 				'EmailsTotal' => count($recipient_emails),
 			);
 		}
 
 		/**
 		 * Groups recipients by type
 		 *
 		 * @param Array $recipients
 		 * @return Array
 		 * @access public
 		 */
 		public function groupRecipientsByType($recipients)
 		{
 			$recipients_grouped = Array ();
 
 			foreach ($recipients as $recipient) {
 				if ( strpos($recipient, '_') !== false ) {
 					list ($recipient_type, $recipient_id) = explode('_', $recipient);
 				}
 				else {
 					$recipient_type = 'direct';
 					$recipient_id = $recipient;
 				}
 
 				if ( !array_key_exists($recipient_type, $recipients_grouped) ) {
 					$recipients_grouped[$recipient_type] = Array ();
 				}
 
 				$recipients_grouped[$recipient_type][] = $recipient_id;
 			}
 
 			return $recipients_grouped;
 		}
 
 		function _getRecipientEmails($recipient_type, $recipient_ids)
 		{
 			if (strpos($recipient_type, '.') !== false) {
 				// remove special
 				list ($recipient_type, ) = explode('.', $recipient_type);
 			}
 
 			if ($recipient_type != 'u' && $recipient_type != 'g') {
 				// these are already emails
 				return $recipient_ids;
 			}
 
 			switch ($recipient_type) {
 				case 'u':
 					$sql = 'SELECT Email
 							FROM ' . TABLE_PREFIX . 'Users
 							WHERE (PortalUserId IN (' . implode(',', $recipient_ids) . ')) AND (Email <> "")';
 					break;
 
 				case 'g':
 					$sql = 'SELECT u.Email
 							FROM ' . TABLE_PREFIX . 'UserGroupRelations ug
 							LEFT JOIN ' . TABLE_PREFIX . 'Users u ON u.PortalUserId = ug.PortalUserId
 							WHERE (ug.GroupId IN (' . implode(',', $recipient_ids) . ')) AND (u.Email <> "")';
 					break;
 
 				default:
 					$sql = '';
 					break;
 			}
 
 			return $this->Conn->GetCol($sql);
 		}
 
 		function getRecipientNames($recipient_type, $recipient_ids)
 		{
 			if (strpos($recipient_type, '.') !== false) {
 				// remove special
 				list ($recipient_type, ) = explode('.', $recipient_type);
 			}
 
 			switch ($recipient_type) {
 				case 'u':
 					$title_field = 'Email';
 					break;
 
 				case 'g':
 					$title_field = 'Name';
 					break;
 
 				default:
 					$title_field = false;
 					break;
 			}
 
 			if ($title_field === false || !$recipient_ids) {
 				return $recipient_ids;
 			}
 
 			$config = $this->Application->getUnitConfig($recipient_type);
 			$id_field = $config->getIDField();
 			$table_name = $config->getTableName();
 
 			$sql = 'SELECT ' . $title_field . '
 					FROM ' . $table_name . '
 					WHERE ' . $id_field . ' IN (' . implode(',', $recipient_ids) . ')';
 			return $this->Conn->GetCol($sql);
 		}
 
 		/**
 		 * Updates information about sent email count based on given totals by mailings
 		 *
 		 * @param Array $mailing_totals
 		 */
 		function _updateSentTotals($mailing_totals)
 		{
 			if ( array_key_exists(0, $mailing_totals) ) {
 				// don't update sent email count for mails queued directly (not via mailing lists)
 				unset($mailing_totals[0]);
 			}
 
 			$config = $this->Application->getUnitConfig('mailing-list');
 			$table_name = $config->getTableName();
 
 			// update sent email count for each processed mailing
 			foreach ( $mailing_totals as $mailing_id => $mailing_total ) {
 				$sql = 'UPDATE ' . $table_name . '
 						SET EmailsSent = EmailsSent + ' . $mailing_total . '
 						WHERE ' . $config->getIDField() . ' = ' . $mailing_id;
 				$this->Conn->Query($sql);
 			}
 
 			// mark mailings, that were processed completely
 			$sql = 'UPDATE ' . $table_name . '
 					SET Status = ' . MailingList::PROCESSED . '
 					WHERE (Status = ' . MailingList::PARTIALLY_PROCESSED . ') AND (EmailsSent = EmailsTotal)';
 			$this->Conn->Query($sql);
 		}
 
 		/**
 		 * Sent given messages from email queue.
 		 *
 		 * @return integer
 		 */
 		function processQueue()
 		{
+			/** @var kEmailSendingHelper $esender */
 			$esender = $this->Application->recallObject('EmailSender');
-			/* @var $esender kEmailSendingHelper */
 
 			$messages = $this->getMessages();
 			$message_count = count($messages);
 
 			if ( !$message_count ) {
 				return 0;
 			}
 
 			$i = 0;
 			$message = Array();
 			$mailing_totals = Array();
 			$queue_table = $this->Application->getUnitConfig('email-queue')->getTableName();
 
 			while ( $i < $message_count ) {
 				$message[0] = unserialize($messages[$i]['MessageHeaders']);
 				$message[1] =& $messages[$i]['MessageBody'];
 
 				$esender->setLogData(unserialize($messages[$i]['LogData']));
 				$delivered = $esender->Deliver($message, true); // immediate send!
 
 				if ( $delivered ) {
 					// send succeeded, delete from queue
 					$sql = 'DELETE FROM ' . $queue_table . '
 							WHERE EmailQueueId = ' . $messages[$i]['EmailQueueId'];
 					$this->Conn->Query($sql);
 
 					$mailing_id = $messages[$i]['MailingId'];
 					if ( !array_key_exists($mailing_id, $mailing_totals) ) {
 						$mailing_totals[$mailing_id] = 0;
 					}
 					$mailing_totals[$mailing_id]++;
 				}
 				else {
 					// send failed, increment retries counter
 					$sql = 'UPDATE ' . $queue_table . '
 							SET SendRetries = SendRetries + 1, LastSendRetry = ' . time() . '
 							WHERE EmailQueueId = ' . $messages[$i]['EmailQueueId'];
 					$this->Conn->Query($sql);
 				}
 				$i++;
 			}
 
 			$this->_updateSentTotals($mailing_totals);
 
 			return $message_count;
 		}
 
 		/**
 		 * Returns queued messages (or their count), that can be sent
 		 *
 		 * @param bool $count_only
 		 *
 		 * @return Array|int
 		 * @access public
 		 */
 		public function getMessages($count_only = false)
 		{
 			$deliver_count = $this->getSetting('MailingListSendPerStep');
 
 			if ( !is_numeric($deliver_count) ) {
 				return $count_only ? 0 : Array();
 			}
 
 			$queue_table = $this->Application->getUnitConfig('email-queue')->getTableName();
 
 			if ( $count_only ) {
 				$sql = 'SELECT COUNT(*)
 						FROM ' . $queue_table . '
 						WHERE (SendRetries < 5) AND (LastSendRetry < ' . strtotime('-2 hours') . ')';
 
 				return $this->Conn->GetOne($sql);
 			}
 
 			// regular e-mails are pressed before mailing generated ones !
 			$sql = 'SELECT *
 					FROM ' . $queue_table . '
 					WHERE (SendRetries < 5) AND (LastSendRetry < ' . strtotime('-2 hours') . ')
 					ORDER BY MailingId ASC
 					LIMIT 0,' . $deliver_count;
 
 			return $this->Conn->Query($sql);
 		}
 
 		/**
 		 * Allows to safely get mailing configuration variable
 		 *
 		 * @param string $variable_name
 		 *
 		 * @return int
 		 * @access public
 		 */
 		public function getSetting($variable_name)
 		{
 			$value = $this->Application->ConfigValue($variable_name);
 
 			if ( $value === false ) {
 				// ensure default value, when configuration variable is missing
 				return 10;
 			}
 
 			if ( !$value ) {
 				// configuration variable found, but it's value is empty or zero
 				return false;
 			}
 
 			return $value;
 		}
 	}
\ No newline at end of file
Index: branches/5.3.x/core/units/helpers/list_helper.php
===================================================================
--- branches/5.3.x/core/units/helpers/list_helper.php	(revision 16518)
+++ branches/5.3.x/core/units/helpers/list_helper.php	(revision 16519)
@@ -1,221 +1,221 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 	class ListHelper extends kHelper {
 
 		/**
 		 * Detects, that current sorting of the list is not default
 		 *
 		 * @param kDBList $list
 		 * @return bool
 		 */
 		function hasUserSorting(&$list)
 		{
 			static $cache = Array ();
 
 			if ( array_key_exists($list->getPrefixSpecial(), $cache) ) {
 				return $cache[$list->getPrefixSpecial()];
 			}
 
 			$user_sorting_start = $this->getUserSortIndex($list);
 
 			$config = $list->getUnitConfig();
 			$sorting_configs = $config->getConfigMapping(Array ());
 			$list_sortings = $config->getListSortingsBySpecial($list, Array ());
 
 			if ( array_key_exists('DefaultSorting1Field', $sorting_configs) ) {
 				$list_sortings['Sorting'] = Array (
 					$this->Application->ConfigValue($sorting_configs['DefaultSorting1Field']) => $this->Application->ConfigValue($sorting_configs['DefaultSorting1Dir']),
 					$this->Application->ConfigValue($sorting_configs['DefaultSorting2Field']) => $this->Application->ConfigValue($sorting_configs['DefaultSorting2Dir']),
 				);
 			}
 
 			$sorting = getArrayValue($list_sortings, 'Sorting');
 			$sort_fields = is_array($sorting) ? array_keys($sorting) : Array ();
 
 			for ($order_number = 0; $order_number < 2; $order_number++) {
 				// current sorting in list
 				$sorting_pos = $user_sorting_start + $order_number;
 				$current_order_field = $list->GetOrderField($sorting_pos, true);
 				$current_order_direction = $list->GetOrderDirection($sorting_pos, true);
 
 				if ( !$current_order_field || !$current_order_direction ) {
 					// no sorting defined for this sorting position
 					continue;
 				}
 
 				// remove language prefix from field
 				$field_options = $list->GetFieldOptions($current_order_field);
 				if ( array_key_exists('formatter', $field_options) && $field_options['formatter'] == 'kMultiLanguage' ) {
 					// remove language prefix
 					$current_order_field = preg_replace('/^l[\d]+_(.*)/', '\\1', $current_order_field);
 				}
 
 				// user sorting found
 				if ( array_key_exists($order_number, $sort_fields) ) {
 					// default sorting found
 					$default_order_field = $sort_fields[$order_number];
 					$default_order_direction = $sorting[$default_order_field]; // because people can write
 
 					if ( $current_order_field != $default_order_field || strcasecmp($current_order_direction, $default_order_direction) != 0 ) {
 						// #1. user sorting differs from default sorting -> changed
 						$cache[$list->getPrefixSpecial()] = true;
 
 						return true;
 					}
 				}
 				else {
 					// #2. user sorting + no default sorting -> changed
 					$cache[$list->getPrefixSpecial()] = true;
 
 					return true;
 				}
 			}
 
 			// #3. user sorting match default or not defined -> not changed
 			$cache[$list->getPrefixSpecial()] = false;
 
 			return false;
 		}
 
 		/**
 		 * Returns default per-page value for given prefix
 		 *
 		 * @param string $prefix
 		 * @param int $default
 		 * @return int
 		 */
 		function getDefaultPerPage($prefix, $default = 10)
 		{
 			$ret = false;
 			$config_mapping = $this->Application->getUnitConfig($prefix)->getConfigMapping();
 
 			if ( $config_mapping ) {
 				if ( !array_key_exists('PerPage', $config_mapping) ) {
 					trigger_error('Incorrect mapping of <span class="debug_error">PerPage</span> key in config for prefix <strong>' . $prefix . '</strong>', E_USER_WARNING);
 				}
 
 				$per_page = $this->Application->ConfigValue($config_mapping['PerPage']);
 
 				if ( $per_page ) {
 					return $per_page;
 				}
 			}
 
 			// none of checked above per-page locations are useful, then try default value
 			return $default;
 		}
 
 		/**
 		 * Returns index where 1st changable sorting field begins
 		 *
 		 * @param kDBList $list
 		 * @return int
 		 * @todo 	This is copy of kDBTagProcessor::getUserSortIndex method.
 		 * 			Can't call helper there, because it will slow down grid output
 		 * 			when we have a lot of columns
 		 */
 		function getUserSortIndex(&$list)
 		{
 			$list_sortings = $list->getUnitConfig()->getListSortingsBySpecial($list, Array ());
 
 			$user_sorting_start = 0;
 			$forced_sorting = getArrayValue($list_sortings, 'ForcedSorting');
 
 			if ( $forced_sorting ) {
 				$user_sorting_start = count($forced_sorting);
 			}
 
 			return $user_sorting_start;
 		}
 
 		/**
 		 * Returns ID of previous/next record related to current record
 		 *
 		 * @param kDBItem $object
 		 * @param string $list_prefix
 		 * @param bool $next
 		 * @param string $select_fields
 		 * @return int
 		 */
 		function getNavigationResource(&$object, $list_prefix, $next = true, $select_fields = null)
 		{
+			/** @var kDBList $list */
 			$list = $this->Application->recallObject($list_prefix);
-			/* @var $list kDBList */
 
 			if ( !isset($select_fields) ) {
 				$select_fields = '%1$s.' . $object->IDField;
 			}
 
 			if ( is_array($select_fields) ) {
 				$select_fields = implode(', ', $select_fields);
 			}
 
 			$list->SetSelectSQL( str_replace(Array ('%1$s.*', '%2$s'), Array ($select_fields, ''), $list->GetPlainSelectSQL()) );
 
 			$operators = Array (
 				'asc' => $next ? '>' : '<',
 				'desc' => $next ? '<' : '>',
 			);
 
 			$where_clause = Array ();
 			$lang = $this->Application->GetVar('m_lang');
 			$order_fields = $order_fields_backup = $list->getOrderFields();
 
 			foreach ($order_fields as $index => $order) {
 				$where_clause[$index] = Array ();
 
 				if ( !$next ) {
 					$list->changeOrderDirection($index, $order_fields_backup[$index][1] == 'asc' ? 'desc' : 'asc');
 				}
 
 				for ($i = 0; $i <= $index; $i++) {
 					$order_field = $order_fields_backup[$i][0];
 					$is_expression = $order_fields_backup[$i][2];
 
 					if ( preg_match('/^IF\(COALESCE\(.*?\.(l' . $lang . '_.*?), ""\),/', $order_field, $regs) ) {
 						// undo result of kDBList::getMLSortField method
 						$order_field = $regs[1];
 						$is_expression = false;
 					}
 
 					$order_direction = $order_fields_backup[$i][1];
 
 					$field_prefix = $list->isVirtualField($order_field) || $is_expression ? '' : '%1$s.';
 
 					$actual_operator = $i == $index ? $operators[$order_direction] : '=';
 					$where_clause[$index][] = $field_prefix . $order_field . ' ' . $actual_operator . ' ' . $this->Conn->qstr($object->GetDBField($order_field));
 				}
 
 				$where_clause[$index] = '(' . implode(') AND (', $where_clause[$index]) . ')';
 			}
 
 			$where_clause = '(%1$s.' . $object->IDField . ' != ' . $object->GetID() . ') AND ((' . implode(') OR (', $where_clause) . '))';
 			$list->addFilter('navigation_filter', $where_clause);
 
 			// do extractCalculatedFields (transforms having into where), since we don't select fields from JOINed tables
 			$sql = $list->extractCalculatedFields($list->GetSelectSQL(), 1, true);
 
 			$list->removeFilter('navigation_filter');
 			$list->setOrderFields($order_fields_backup);
 
 			if ( $this->Application->isDebugMode() ) {
 				$this->Application->Debugger->appendHTML('Quering <strong>' . ($next ? 'next' : 'previous') . '</strong> item for "<strong>' . $list_prefix . '</strong>" list:');
 			}
 
 			return $this->Conn->GetOne($sql);
 		}
 	}
\ No newline at end of file
Index: branches/5.3.x/core/units/helpers/page_helper.php
===================================================================
--- branches/5.3.x/core/units/helpers/page_helper.php	(revision 16518)
+++ branches/5.3.x/core/units/helpers/page_helper.php	(revision 16519)
@@ -1,441 +1,441 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class PageHelper extends kHelper {
 
 	/**
 	 * Returns page info
 	 *
 	 * @param int $page_id
 	 * @return Array
 	 */
 	function getPageInfo($page_id)
 	{
 		list ($user_id, $history_permission) = $this->getHistoryPermissionAndUser($page_id);
 
 		$users = $this->getEditors($page_id, $user_id);
 
 		return array(
 			'current_revision' => $this->getCurrentRevisionInfo(),
 			'editors' => $users,
 			'editors_warning' => $this->getEditorsWarning($users),
 			'revisions' => $history_permission ? $this->getPageRevisions($page_id) : array(),
 		);
 	}
 
 	/**
 	 * Returns current admin user id (even, when called from front-end) and it's revision history view permission
 	 *
 	 * @param int $page_id
 	 * @return Array
 	 */
 	protected function getHistoryPermissionAndUser($page_id)
 	{
+		/** @var kPermissionsHelper $perm_helper */
 		$perm_helper = $this->Application->recallObject('PermissionsHelper');
-		/* @var $perm_helper kPermissionsHelper */
 
 		$user_id = (int)$this->Application->RecallVar($this->Application->isAdmin ? 'user_id' : 'admin_user_id');
 		$history_permission = $perm_helper->CheckUserPermission($user_id, 'CATEGORY.REVISION.HISTORY.VIEW', 0, $page_id);
 
 		return Array ($user_id, $history_permission);
 	}
 
 	/**
 	 * Returns information about given page editors.
 	 *
 	 * @param integer $page_id Page, that is being edited.
 	 * @param integer $user_id User, who is editing a page.
 	 *
 	 * @return array
 	 */
 	protected function getEditors($page_id, $user_id)
 	{
 		$where_clause = array(
 			'pr.PageId = ' . $page_id,
 			'pr.CreatedById <> ' . $user_id,
 			'pr.IsDraft = 1',
 		);
 
 		$sql = 'SELECT CASE pr.CreatedById WHEN ' . USER_ROOT . ' THEN "root" WHEN ' . USER_GUEST . ' THEN "Guest" ELSE IF(u.Username = "", u.Email, u.Username) END
 				FROM ' . $this->Application->getUnitConfig('page-revision')->getTableName() . ' pr
 				LEFT JOIN ' . TABLE_PREFIX . 'Users u ON u.PortalUserId = pr.CreatedById
 				WHERE (' . implode(') AND (', $where_clause) . ')';
 
 		return $this->Conn->GetCol($sql);
 	}
 
 	/**
 	 * Returns information about current revision.
 	 *
 	 * @return array
 	 */
 	protected function getCurrentRevisionInfo()
 	{
+		/** @var kDBItem $revision */
 		$revision = $this->Application->recallObject('page-revision.current');
-		/* @var $revision kDBItem */
 
 		$status_label = $this->getRevisionStatusText($revision);
 
 		$draft = $revision->GetDBField('IsDraft');
 		$title = $this->getAdminPhrase($draft ? 'la_title_EditingDraft' : 'la_title_ViewingRevision');
 
 		$current_revision_info = array(
 			'title' => sprintf($title, $revision->GetDBField('RevisionNumber'), $status_label),
 			'status' => $revision->GetDBField('Status'),
 			'saved' => '',
 			'toolbar_state' => $this->getToolbarButtonsState($revision),
 		);
 
 		$auto_save_time = $revision->GetDBField('AutoSavedOn');
 
 		if ( $auto_save_time ) {
 			$phrase = $this->getAdminPhrase($draft ? 'la_DraftSavedAt' : 'la_SavedAt');
 			$current_revision_info['saved'] = sprintf($phrase, $revision->GetField('AutoSavedOn_time') . ' (' . $this->getAgoTime($auto_save_time) . ')');
 		}
 
 		return $current_revision_info;
 	}
 
 	/**
 	 * Returns state of all CMS revision toolbar buttons.
 	 *
 	 * @param kDBItem $revision Page Revision.
 	 *
 	 * @return array
 	 */
 	public function getToolbarButtonsState(kDBItem $revision)
 	{
 		$ret = array();
 
 		foreach ( $this->getToolbarButtons() as $toolbar_button ) {
 			$ret[$toolbar_button] = $this->isToolbarButtonEnabled($toolbar_button, $revision);
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Returns list of CMS revision toolbar buttons.
 	 *
 	 * @return array
 	 */
 	protected function getToolbarButtons()
 	{
 		return array('select', 'delete', 'approve', 'decline', 'preview', 'history');
 	}
 
 	/**
 	 * Checks if given CMS revision toolbar button is enabled for given revision.
 	 *
 	 * @param string  $button_name Toolbar button name.
 	 * @param kDBItem $revision    Revision to check against.
 	 *
 	 * @return boolean
 	 */
 	protected function isToolbarButtonEnabled($button_name, kDBItem $revision)
 	{
 		$is_draft = $revision->GetDBField('IsDraft');
 
 		if ( $button_name == 'select' || $button_name == 'delete' || $button_name == 'preview' ) {
 			return (bool)$is_draft;
 		}
 
 		if ( $button_name == 'approve' ) {
 			return $revision->GetDBField('Status') != STATUS_ACTIVE && !$is_draft;
 		}
 
 		if ( $button_name == 'decline' ) {
 			return $revision->GetDBField('Status') != STATUS_DISABLED && !$revision->GetDBField('IsLive') && !$is_draft;
 		}
 
 		return true;
 	}
 
 	/**
 	 * Returns warning to be shown in case of parallel editing attempts.
 	 *
 	 * @param array $users Users, that are editing a page.
 	 *
 	 * @return string
 	 */
 	protected function getEditorsWarning(array $users)
 	{
+		/** @var kMultiLanguageHelper $ml_helper */
 		$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
-		/* @var $ml_helper kMultiLanguageHelper */
 
 		$ret = $ml_helper->getPluralPhrase(
 			count($users),
 			array(
 				'phrase1' => 'la_PageCurrentlyEditing1',
 				'phrase2' => 'la_PageCurrentlyEditing2',
 				'phrase5' => 'la_PageCurrentlyEditing5',
 			),
 			false, true
 		);
 
 		return sprintf($ret, implode(', ', $users));
 	}
 
 	/**
 	 * Returns information about given page revisions.
 	 *
 	 * @param integer $page_id Page, that is being edited.
 	 *
 	 * @return array
 	 */
 	protected function getPageRevisions($page_id)
 	{
 		$ret = Array ();
 
 		$tag_params = Array ('per_page' => -1, 'skip_parent_filter' => 1, 'requery' => 1, 'page_id' => $page_id);
 
+		/** @var kDBList $revisions */
 		$revisions = $this->Application->recallObject('page-revision.list', 'page-revision_List', $tag_params);
-		/* @var $revisions kDBList */
 
 		$revisions->Query();
 		$revisions->GoFirst();
 
 		while ( !$revisions->EOL() ) {
 			$ret[ 'r' . $revisions->GetDBField('RevisionNumber') ] = array(
 				'title' => $this->getRevisionTitle($revisions),
 				'status' => $revisions->GetDBField('Status'),
 				'status_label' => $this->getRevisionStatusText($revisions),
 				'datetime' => $revisions->GetField('CreatedOn'),
 				'author' => $this->getRevisionAuthor($revisions),
 				'draft' => (int)$revisions->GetDBField('IsDraft'),
 			);
 
 			$revisions->GoNext();
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Returns title for given revision.
 	 *
 	 * @param kDBBase $revision Page Revision.
 	 *
 	 * @return string
 	 */
 	protected function getRevisionTitle(kDBBase $revision)
 	{
 		if ( $revision->GetDBField('IsDraft') ) {
 			return $this->getAdminPhrase('la_Draft');
 		}
 
 		$title = $this->getAdminPhrase('la_RevisionNumber');
 
 		return sprintf($title, $revision->GetDBField('RevisionNumber'));
 	}
 
 	/**
 	 * Returns status text for given revision.
 	 *
 	 * @param kDBBase $revision Page Revision.
 	 *
 	 * @return string
 	 */
 	protected function getRevisionStatusText(kDBBase $revision)
 	{
 		$status = $revision->GetDBField('Status');
 		$options = $revision->GetFieldOptions('Status');
 
 		return mb_strtolower($this->getAdminPhrase($options['options'][$status]));
 	}
 
 	/**
 	 * Returns author of given revision.
 	 *
 	 * @param kDBBase $revision Page Revision.
 	 *
 	 * @return string
 	 */
 	protected function getRevisionAuthor(kDBBase $revision)
 	{
 		$by_label = $this->getAdminPhrase('la_By');
 
 		return $by_label . ': ' . $revision->GetField('CreatedById');
 	}
 
 	/**
 	 * Returns Admin's non-editable translation of given phrase.
 	 *
 	 * @param string $label Phrase label.
 	 *
 	 * @return string
 	 */
 	protected function getAdminPhrase($label)
 	{
 		return $this->Application->Phrase($label, false, true);
 	}
 
 	/**
 	 * Returns time passed between 2 given dates in "X minutes Y seconds ago" format
 	 *
 	 * @param int $from_date
 	 * @param int $to_date
 	 * @param integer $max_levels
 	 *
 	 * @return string
 	 */
 	public function getAgoTime($from_date, $to_date = null, $max_levels = 1)
 	{
 		$blocks = Array (
 			Array ('name' => 'year', 'amount' => 60*60*24*365),
 			Array ('name' => 'month' ,'amount' => 60*60*24*31),
 			Array ('name' => 'week', 'amount' => 60*60*24*7),
 			Array ('name' => 'day', 'amount' => 60*60*24),
 			Array ('name' => 'hour', 'amount' => 60*60),
 			Array ('name' => 'minute', 'amount' => 60),
 			Array ('name' => 'second', 'amount' => 1),
 		);
 
 		if ( !isset($to_date) ) {
 			$to_date = time();
 		}
 
 		$diff = abs($to_date - $from_date);
 
 		if ( $diff == 0 ) {
 			return 'now';
 		}
 
 		$current_level = 1;
 		$result = Array ();
 
 		foreach ($blocks as $block) {
 			if ($current_level > $max_levels) {
 				break;
 			}
 
 			if ( $diff / $block['amount'] >= 1 ) {
 				$amount = floor($diff / $block['amount']);
 				$plural = $amount > 1 ? 's' : '';
 
 				$result[] = $amount . ' ' . $block['name'] . $plural;
 				$diff -= $amount * $block['amount'];
 				$current_level++;
 			}
 		}
 
 		return implode(' ', $result) . ' ago';
 	}
 
 	/**
 	 * Returns where clause for loading correct revision for a given page
 	 *
 	 * @param int $page_id
 	 * @param int $live_revision_number
 	 * @param string $table_name
 	 * @return string
 	 */
 	public function getRevsionWhereClause($page_id, $live_revision_number, $table_name = '')
 	{
 		$revision = (int)$this->Application->GetVar('revision');
 		list ($user_id, $has_permission) = $this->getHistoryPermissionAndUser($page_id);
 
 		if ( $has_permission && $revision ) {
 			$revision_clause = $table_name . 'RevisionNumber = ' . $revision . ' AND ' . $table_name . 'IsDraft = 0';
 		}
 		else {
 			$editing_mode = $this->Application->GetVar('editing_mode'); // not in a EDITING_MODE constant, while in admin console
 			$revision_clause = $table_name . 'RevisionNumber = ' . $live_revision_number . ' AND ' . $table_name . 'IsDraft = 0';
 
 			if ( $this->Application->ConfigValue('EnablePageContentRevisionControl') ) {
 				if ( $this->Application->GetVar('preview') || $editing_mode == EDITING_MODE_CONTENT ) {
 					$revision_clause = '(' . $table_name . 'CreatedById = ' . $user_id . ' AND ' . $table_name . 'IsDraft = 1) OR (' . $revision_clause . ')';
 				}
 			}
 		}
 
 		return $revision_clause;
 	}
 
 	/**
 	 * Creates new content block in every revision that misses it. Plus creates first page revision
 	 *
 	 * @param int $page_id
 	 * @param int $num
 	 */
 	public function createNewContentBlock($page_id, $num)
 	{
 		$sql = 'SELECT pc.PageContentId, pr.RevisionId
 				FROM ' . TABLE_PREFIX . 'PageRevisions pr
 				LEFT JOIN ' . TABLE_PREFIX . 'PageContent pc ON pc.RevisionId = pr.RevisionId AND pc.ContentNum = ' . $num . '
 				WHERE pr.PageId = ' . $page_id;
 		$revisions = $this->Conn->GetCol($sql, 'RevisionId');
 
 		if ( !$revisions ) {
 			// no revisions for a page -> create a live revision
+			/** @var kDBItem $revision */
 			$revision = $this->Application->recallObject('page-revision.live', null, Array ('skip_autoload' => true));
-			/* @var $revision kDBItem */
 
 			$revision->SetDBField('PageId', $page_id);
 			$revision->SetDBField('RevisionNumber', 1);
 			$revision->SetDBField('Status', STATUS_ACTIVE);
 			$revision->Create();
 
 			$revisions[ $revision->GetID() ] = NULL;
 		}
 
+		/** @var kDBItem $content_block */
 		$content_block = $this->Application->recallObject('content.new', null, Array ('skip_autoload' => true));
-		/* @var $content_block kDBItem */
 
 		$content_block->SetDBField('PageId', $page_id);
 		$content_block->SetDBField('ContentNum', $num);
 
 		foreach ($revisions as $revision_id => $content_block_id) {
 			if ( is_numeric($content_block_id) ) {
 				continue;
 			}
 
 			$content_block->SetDBField('RevisionId', $revision_id);
 			$content_block->Create();
 		}
 	}
 
 	/**
 	 * Loads content block by it's number
 	 *
 	 * @param kDBItem $content_block
 	 * @param CategoriesItem $page
 	 * @param int $num
 	 *
 	 * @return bool
 	 */
 	public function loadContentBlock(&$content_block, &$page, $num)
 	{
 		$page_id = $page->GetID();
 
 		if ( !EDITING_MODE && !$this->Application->GetVar('preview') ) {
 			$revision_clause = 'pr.RevisionNumber = ' . $page->GetDBField('LiveRevisionNumber') . ' AND pr.IsDraft = 0';
 		}
 		else {
 			$revision_clause = $this->getRevsionWhereClause($page_id, $page->GetDBField('LiveRevisionNumber'), 'pr.');
 		}
 
 
 		$sql = 	$content_block->GetSelectSQL() . '
 				WHERE (' . $content_block->TableName . '.PageId = ' . $page_id . ') AND (' . $content_block->TableName . '.ContentNum = ' . $num . ') AND (' . $revision_clause . ')
 				ORDER BY pr.IsDraft DESC, pr.RevisionNumber DESC';
 		$content_data = $this->Conn->GetRow($sql);
 
 		$content_block->LoadFromHash($content_data);
 
 		return $content_block->isLoaded();
 	}
 }
Index: branches/5.3.x/core/units/helpers/category_helper.php
===================================================================
--- branches/5.3.x/core/units/helpers/category_helper.php	(revision 16518)
+++ branches/5.3.x/core/units/helpers/category_helper.php	(revision 16519)
@@ -1,361 +1,361 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class CategoryHelper extends kHelper {
 
 		/**
 		 * Structure tree for ParentId field in category or category items
 		 *
 		 * @var Array
 		 */
 		var $_structureTree = null;
 
 		/**
 		 * ID of primary language (only for caching)
 		 *
 		 * @var int
 		 */
 		var $_primaryLanguageId = false;
 
 		/**
 		 * Returns module information based on given module name or current category
 		 * (relative to module root categories).
 		 *
 		 * @param array $params        Tag params.
 		 * @param array $category_path Category parent path.
 		 *
 		 * @return array
 		 */
 		public function getCategoryModule(array $params, array $category_path)
 		{
 			// Get module by name.
 			if ( isset($params['module']) ) {
 				return $this->Application->findModule('Name', $params['module']);
 			}
 
 			// Get module by category path.
 			if ( $category_path ) {
 				foreach ( array_reverse($category_path) as $module_category_id ) {
 					$module_info = $this->Application->findModule('RootCat', $module_category_id);
 
 					if ( $module_info && $module_info['Var'] != 'adm' ) {
 						return $module_info;
 					}
 				}
 			}
 
 			return array();
 		}
 
 		/**
 		 * Converts multi-dimensional category structure in one-dimensional option array (category_id=>category_name)
 		 *
 		 * @param Array $data
 		 * @param int $parent_category_id
 		 * @param int $language_id
 		 * @param int $theme_id
 		 * @param int $level
 		 * @return Array
 		 * @access protected
 		 */
 		protected function _printChildren(&$data, $parent_category_id, $language_id, $theme_id, $level = 0)
 		{
 			if ( $data['ThemeId'] != $theme_id && $data['ThemeId'] != 0 ) {
 				// don't show system templates from different themes
 				return Array ();
 			}
 
 			$category_language = $data['l' . $language_id . '_Name'] ? $language_id : $this->_primaryLanguageId;
 			$ret = Array ($parent_category_id => str_repeat('&mdash;', $level) . ' ' . $data['l' . $category_language . '_Name']);
 
 			if ( $data['children'] ) {
 				$level++;
 				foreach ($data['children'] as $category_id => $category_data) {
 					// numeric keys
 					$ret = kUtil::array_merge_recursive($ret, $this->_printChildren($data['children'][$category_id], $category_id, $language_id, $theme_id, $level));
 				}
 			}
 
 			return $ret;
 		}
 
 		/**
 		 * Returns information about children under parent path (recursive)
 		 *
 		 * @param int $parent_category_id
 		 * @param Array $languages
 		 * @return Array
 		 * @access protected
 		 */
 		protected function _getChildren($parent_category_id, $languages)
 		{
 			static $items_by_parent = null, $parent_mapping = null;
 
 			if ( !isset($items_by_parent) ) {
 				$fields = $items_by_parent = Array ();
 
 				foreach ($languages as $language_id) {
 					$fields[] = 'l' . $language_id . '_Name';
 				}
 
 				$sql = 'SELECT CategoryId AS id, ' . implode(', ', $fields) . ', ParentId, Template, ThemeId
 						FROM ' . TABLE_PREFIX . 'Categories
 						ORDER BY Priority DESC';
 				$items = $this->Conn->Query($sql, 'id');
 
 				foreach ($items as $item_id => $item_data) {
 					$item_parent_id = $item_data['ParentId'];
 					unset($item_data['ParentId']);
 
 					if ( !array_key_exists($item_parent_id, $items_by_parent) ) {
 						$items_by_parent[$item_parent_id] = Array ();
 					}
 
 					$item_data['children'] = false;
 					$parent_mapping[$item_id] = $item_parent_id;
 					$items_by_parent[$item_parent_id][$item_id] = $item_data;
 				}
 
 				$base_category = $this->Application->getBaseCategory(); // "Content" category
 
 				if ( isset($items_by_parent[$base_category]) ) {
 					$index_category = $this->findIndexCategoryId($items_by_parent[$base_category]);
 
 					// rename "Content" into "Home" keeping it's ID
 					$items_by_parent[$parent_mapping[$base_category]][$base_category]['l1_Name'] = $this->Application->Phrase('la_rootcategory_name');
 
 					if ( $index_category !== false ) {
 						// remove category of "index.tpl" template
 						unset($items_by_parent[$base_category][$index_category]);
 						unset($parent_mapping[$index_category]);
 					}
 				}
 			}
 
 			$data = $items_by_parent[$parent_mapping[$parent_category_id]][$parent_category_id];
 			$categories = array_key_exists($parent_category_id, $items_by_parent) ? $items_by_parent[$parent_category_id] : Array ();
 
 			foreach ($categories as $category_id => $category_data) {
 				if ( $category_id == $parent_category_id ) {
 					// don't process myself - prevents recursion
 					continue;
 				}
 
 				$data['children'][$category_id] = $this->_getChildren($category_id, $languages);
 			}
 
 			return $data;
 		}
 
 		/**
 		 * Finds "Home" category among given top level categories
 		 *
 		 * @param Array $top_categories
 		 * @return bool|int
 		 * @access protected
 		 */
 		protected function findIndexCategoryId($top_categories)
 		{
 			foreach ($top_categories as $category_id => $category_info) {
 				if ($category_info['Template'] == 'index') {
 					return $category_id;
 				}
 			}
 
 			return false;
 		}
 
 		/**
 		 * Generates OR retrieves from cache structure tree
 		 *
 		 * @return Array
 		 * @access protected
 		 */
 		protected function &_getStructureTree()
 		{
 			// get cached version of structure tree
 			if ( $this->Application->isCachingType(CACHING_TYPE_MEMORY) ) {
 				$data = $this->Application->getCache('master:StructureTree', false, CacheSettings::$structureTreeRebuildTime);
 			}
 			else {
 				$data = $this->Application->getDBCache('StructureTree', CacheSettings::$structureTreeRebuildTime);
 			}
 
 			if ( $data ) {
 				$data = unserialize($data);
 
 				return $data;
 			}
 
 			// generate structure tree from scratch
+			/** @var kMultiLanguageHelper $ml_helper */
 			$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
-			/* @var $ml_helper kMultiLanguageHelper */
 
 			$languages = $ml_helper->getLanguages();
 			$root_category = $this->Application->getBaseCategory();
 			$data = $this->_getChildren($root_category, $languages);
 
 			if ( $this->Application->isCachingType(CACHING_TYPE_MEMORY) ) {
 				$this->Application->setCache('master:StructureTree', serialize($data));
 			}
 			else {
 				$this->Application->setDBCache('StructureTree', serialize($data));
 			}
 
 			return $data;
 		}
 
 		/**
 		 * Returns template mapping (between physical and virtual pages)
 		 *
 		 * @return Array
 		 * @access public
 		 */
 		public function getTemplateMapping()
 		{
 			if ( $this->Application->isCachingType(CACHING_TYPE_MEMORY) ) {
 				$data = $this->Application->getCache('master:template_mapping', false, CacheSettings::$templateMappingRebuildTime);
 			}
 			else {
 				$data = $this->Application->getDBCache('template_mapping', CacheSettings::$templateMappingRebuildTime);
 			}
 
 			if ( $data ) {
 				return unserialize($data);
 			}
 
 			$sql = 'SELECT
 						IF(c.`Type` = ' . PAGE_TYPE_TEMPLATE . ', CONCAT(c.Template, ":", c.ThemeId), CONCAT("id:", c.CategoryId)) AS SrcTemplate,
 						LOWER(
 							IF(
 								c.SymLinkCategoryId IS NOT NULL,
 								(SELECT cc.NamedParentPath FROM ' . TABLE_PREFIX . 'Categories AS cc WHERE cc.CategoryId = c.SymLinkCategoryId),
 							 	c.NamedParentPath
 							 )
 						) AS DstTemplate,
 						c.UseExternalUrl, c.ExternalUrl
 					FROM ' . TABLE_PREFIX . 'Categories AS c
 					WHERE c.Status = ' . STATUS_ACTIVE;
 			$pages = $this->Conn->Query($sql, 'SrcTemplate');
 
 			$mapping = Array ();
 			$base_url = $this->Application->BaseURL();
 
 			foreach ($pages as $src_template => $page) {
 				// process external url, before placing in cache
 				if ( $page['UseExternalUrl'] ) {
 					$external_url = $page['ExternalUrl'];
 
 					if ( !preg_match('/^(.*?):\/\/(.*)$/', $external_url) ) {
 						// url without protocol will be relative url to our site
 						$external_url = $base_url . $external_url;
 					}
 
 					$dst_template = 'external:' . $external_url;
 				}
 				else {
 					$dst_template = preg_replace('/^Content\//i', '', $page['DstTemplate']);
 				}
 
 				$mapping[$src_template] = $dst_template;
 			}
 
 			if ( $this->Application->isCachingType(CACHING_TYPE_MEMORY) ) {
 				$data = $this->Application->setCache('master:template_mapping', serialize($mapping));
 			}
 			else {
 				$this->Application->setDBCache('template_mapping', serialize($mapping));
 			}
 
 			return $mapping;
 		}
 
 		/**
 		 * Returns category structure as field option list
 		 *
 		 * @return Array
 		 * @access public
 		 */
 		public function getStructureTreeAsOptions()
 		{
 			if ( (defined('IS_INSTALL') && IS_INSTALL) || !$this->Application->isAdmin ) {
 				// no need to create category structure during install
 				// OR on Front-End, because it's not used there
 				return Array ();
 			}
 
 			if ( isset($this->_structureTree) ) {
 				return $this->_structureTree;
 			}
 
+			/** @var kThemesHelper $themes_helper */
 			$themes_helper = $this->Application->recallObject('ThemesHelper');
-			/* @var $themes_helper kThemesHelper */
 
 			$data = $this->_getStructureTree();
 
 			$theme_id = (int)$themes_helper->getCurrentThemeId();
 
 			$this->_primaryLanguageId = $this->Application->GetDefaultLanguageId();
 			$this->_structureTree = $this->_printChildren($data, $data['id'], $this->Application->GetVar('m_lang'), $theme_id);
 
 			return $this->_structureTree;
 		}
 
 		/**
 		 * Replace links like "@@ID@@" to actual template names in given text
 		 *
 		 * @param string $text
 		 * @return string
 		 * @access public
 		 */
 		public function replacePageIds($text)
 		{
 			if ( !preg_match_all('/@@(\\d+)@@/', $text, $regs) ) {
 				return $text;
 			}
 
 			$page_ids = $regs[1];
 
 			$sql = 'SELECT NamedParentPath, CategoryId
 					FROM ' . TABLE_PREFIX . 'Categories
 					WHERE CategoryId IN (' . implode(',', $page_ids) . ')';
 			$templates = $this->Conn->GetCol($sql, 'CategoryId');
 
 			$base_category = $this->Application->getBaseCategory();
 
 			if ( isset($templates[$base_category]) ) {
 				// "Content" category will act as "Home Page"
 				$templates[$base_category] .= '/Index';
 			}
 
 			foreach ($page_ids as $page_id) {
 				if ( !isset($templates[$page_id]) ) {
 					// internal page was deleted, but link to it was found in given content block data
 					continue;
 				}
 
 				$url_params = Array ('m_cat_id' => $page_id == $base_category ? 0 : $page_id, 'pass' => 'm');
 				$page_url = $this->Application->HREF(strtolower($templates[$page_id]), '', $url_params);
 				/*if ($this->Application->isAdmin) {
 					$page_url = preg_replace('/&(admin|editing_mode)=[\d]/', '', $page_url);
 				}*/
 
 				$text = str_replace('@@' . $page_id . '@@', $page_url, $text);
 			}
 
 			return $text;
 		}
 	}
Index: branches/5.3.x/core/units/helpers/language_import_helper.php
===================================================================
--- branches/5.3.x/core/units/helpers/language_import_helper.php	(revision 16518)
+++ branches/5.3.x/core/units/helpers/language_import_helper.php	(revision 16519)
@@ -1,1315 +1,1315 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 /**
  * Language pack format version description
  *
  * v1
  * ==========
  * All language properties are separate nodes inside <LANGUAGE> node. There are
  * two more nodes PHRASES and EVENTS for phrase and email event translations.
  *
  * v2
  * ==========
  * All data, that will end up in Language table is now attributes of LANGUAGE node
  * and is name exactly as field name, that will be used to store that data.
  *
  * v4
  * ==========
  * Hint & Column translation added to each phrase translation
  *
  * v5
  * ==========
  * Use separate xml nodes for subject, headers, html & plain translations
  *
  * v6
  * ==========
  * Added e-mail design templates
  *
  */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class LanguageImportHelper extends kHelper {
 
 		/**
 		 * Overwrite existing translations during import
 		 */
 		const OVERWRITE_EXISTING = 1;
 
 		/**
 		 * New translations are added as synced with other languages
 		 */
 		const SYNC_ADDED = 2;
 
 		/**
 		 * Current Language in import
 		 *
 		 * @var LanguagesItem
 		 */
 		var $lang_object = null;
 
 		/**
 		 * Current user's IP address
 		 *
 		 * @var string
 		 */
 		var $ip_address = '';
 
 		/**
 		 * Event type + name mapping to id (from system)
 		 *
 		 * @var Array
 		 */
 		var $events_hash = Array ();
 
 		/**
 		 * Language pack import mode
 		 *
 		 * @var int
 		 */
 		var $_importOptions = 0;
 
 		/**
 		 * Language IDs, that were imported
 		 *
 		 * @var Array
 		 */
 		var $_languages = Array ();
 
 		/**
 		 * Temporary table names to perform import on
 		 *
 		 * @var Array
 		 */
 		var $_tables = Array ();
 
 		/**
 		 * Phrase types allowed for import/export operations
 		 *
 		 * @var Array
 		 */
 		var $phrase_types_allowed = Array ();
 
 		/**
 		 * Encoding, used for language pack exporting
 		 *
 		 * @var string
 		 */
 		var $_exportEncoding = 'base64';
 
 		/**
 		 * Exported data limits (all or only specified ones)
 		 *
 		 * @var Array
 		 */
 		var $_exportLimits = Array (
 			'phrases' => false,
 			'email-template' => false,
 			'country-state' => false,
 		);
 
 		/**
 		 * Debug language pack import process
 		 *
 		 * @var bool
 		 */
 		var $_debugMode = false;
 
 		/**
 		 * Latest version of language pack format. Versions are not backwards compatible!
 		 *
 		 * @var int
 		 */
 		var $_latestVersion = 6;
 
 		/**
 		 * Prefix-based serial numbers, that should be changed after import is finished
 		 *
 		 * @var Array
 		 */
 		var $changedPrefixes = Array ();
 
 		public function __construct()
 		{
 			parent::__construct();
 
 			// "core/install/english.lang", phrase count: 3318, xml parse time on windows: 10s, insert time: 0.058s
 			kUtil::setResourceLimit();
 
 			$this->lang_object = $this->Application->recallObject('lang.import', null, Array ('skip_autoload' => true));
 
 			if (!(defined('IS_INSTALL') && IS_INSTALL)) {
 				// perform only, when not in installation mode
 				$this->_updateEventsCache();
 			}
 
 			$this->ip_address = $this->Application->getClientIp();
 
 //			$this->_debugMode = $this->Application->isDebugMode();
 		}
 
 		/**
 		 * Tells if given option is enabled
 		 *
 		 * @param int $option_bit
 		 * @return bool
 		 * @access protected
 		 */
 		protected function hasOption($option_bit)
 		{
 			return ($this->_importOptions & $option_bit) == $option_bit;
 		}
 
 		/**
 		 * Sets import option
 		 *
 		 * @param int $option_bit
 		 * @param bool $enabled
 		 * @return void
 		 * @access public
 		 */
 		public function setOption($option_bit, $enabled = true)
 		{
 			if ( $enabled ) {
 				$this->_importOptions |= $option_bit;
 			}
 			else {
 				$this->_importOptions = $this->_importOptions & ~$option_bit;
 			}
 		}
 
 		/**
 		 * Performs import of given language pack (former Parse method)
 		 *
 		 * @param string $filename
 		 * @param string $phrase_types
 		 * @param Array $module_ids
 		 * @return bool
 		 */
 		function performImport($filename, $phrase_types, $module_ids)
 		{
 			// define the XML parsing routines/functions to call based on the handler path
 			if (!file_exists($filename) || !$phrase_types /*|| !$module_ids*/) {
 				return false;
 			}
 
 			if ($this->_debugMode) {
 				$start_time = microtime(true);
 				$this->Application->Debugger->appendHTML(__CLASS__ . '::' . __FUNCTION__ . '("' . $filename . '")');
 			}
 
 			if (defined('IS_INSTALL') && IS_INSTALL) {
 				// new events could be added during module upgrade
 				$this->_updateEventsCache();
 			}
 
 			$phrase_types = explode('|', substr($phrase_types, 1, -1) );
 //			$module_ids = explode('|', substr($module_ids, 1, -1) );
 
 			$this->phrase_types_allowed = array_flip($phrase_types);
 
 			$this->_parseXML($filename);
 
 			// copy data from temp tables to live
 			foreach ($this->_languages as $language_id) {
 				$this->_performUpgrade($language_id, 'phrases', 'PhraseKey', Array ('l%s_Translation', 'l%s_HintTranslation', 'l%s_ColumnTranslation', 'l%s_TranslateFrom', 'PhraseType'));
 				$this->_performUpgrade($language_id, 'email-template', 'TemplateId', Array ('l%s_Subject', 'Headers', 'l%s_HtmlBody', 'l%s_PlainTextBody', 'l%s_TranslateFrom'));
 				$this->_performUpgrade($language_id, 'country-state', 'CountryStateId', Array ('l%s_Name'));
 			}
 
 			$this->_initImportTables(true);
 			$this->changedPrefixes = array_unique($this->changedPrefixes);
 
 			foreach ($this->changedPrefixes as $prefix) {
 				$this->Application->incrementCacheSerial($prefix);
 			}
 
 			if ($this->_debugMode) {
 				$this->Application->Debugger->appendHTML(__CLASS__ . '::' . __FUNCTION__ . '("' . $filename . '"): ' . (microtime(true) - $start_time));
 			}
 
 			return true;
 		}
 
 		/**
 		 * Creates XML file with exported language data (former Create method)
 		 *
 		 * @param string $filename filename to export into
 		 * @param Array $phrase_types phrases types to export from modules passed in $module_ids
 		 * @param Array $language_ids IDs of languages to export
 		 * @param Array $module_ids IDs of modules to export phrases from
 		 */
 		function performExport($filename, $phrase_types, $language_ids, $module_ids)
 		{
 			$fp = fopen($filename,'w');
 			if (!$fp || !$phrase_types || !$module_ids || !$language_ids) {
 				return false;
 			}
 
 			$phrase_types = explode('|', substr($phrase_types, 1, -1) );
 			$module_ids = explode('|', substr($module_ids, 1, -1) );
 
 			$ret = '<?xml version="1.0" encoding="utf-8"?>' . "\n";
 			$ret .= '<LANGUAGES Version="' . $this->_latestVersion . '">' . "\n";
 
 			$export_fields = $this->_getExportFields();
 
 			// get languages
 			$sql = 'SELECT *
 					FROM ' . $this->Application->getUnitConfig('lang')->getTableName() . '
 					WHERE LanguageId IN (' . implode(',', $language_ids) . ')';
 			$languages = $this->Conn->Query($sql, 'LanguageId');
 
 			// get phrases
 			$phrase_modules = $module_ids;
 			array_push($phrase_modules, ''); // for old language packs without module
 
 			$phrase_modules = $this->Conn->qstrArray($phrase_modules);
 
 			// apply phrase selection limit
 			if ($this->_exportLimits['phrases']) {
 				$escaped_phrases = $this->Conn->qstrArray($this->_exportLimits['phrases']);
 				$limit_where = 'Phrase IN (' . implode(',', $escaped_phrases) . ')';
 			}
 			else {
 				$limit_where = 'TRUE';
 			}
 
 			$sql = 'SELECT *
 					FROM ' . $this->Application->getUnitConfig('phrases')->getTableName() . '
 					WHERE PhraseType IN (' . implode(',', $phrase_types) . ') AND Module IN (' . implode(',', $phrase_modules) . ') AND ' . $limit_where . '
 					ORDER BY Phrase';
 			$phrases = $this->Conn->Query($sql, 'PhraseId');
 
 			// email events
 			$module_sql = preg_replace('/(.*),/U', 'INSTR(Module,\'\\1\') OR ', implode(',', $module_ids) . ',');
 
 			// apply event selection limit
 			if ($this->_exportLimits['email-template']) {
 				$escaped_email_templates = $this->Conn->qstrArray($this->_exportLimits['email-template']);
 				$limit_where = 'TemplateName IN (' . implode(',', $escaped_email_templates) . ')';
 			}
 			else {
 				$limit_where = 'TRUE';
 			}
 
 			$sql = 'SELECT *
 					FROM ' . $this->Application->getUnitConfig('email-template')->getTableName() . '
 					WHERE `Type` IN (' . implode(',', $phrase_types) . ') AND (' . substr($module_sql, 0, -4) . ') AND ' . $limit_where . '
 					ORDER BY TemplateName, `Type`';
 			$email_templates = $this->Conn->Query($sql, 'TemplateId');
 
 			if ( in_array('Core', $module_ids) ) {
 				if ($this->_exportLimits['country-state']) {
 					$escaped_countries = $this->Conn->qstrArray($this->_exportLimits['country-state']);
 					$limit_where = '`IsoCode` IN (' . implode(',', $escaped_countries) . ')';
 				}
 				else {
 					$limit_where = 'TRUE';
 				}
 
 				$country_table = $this->Application->getUnitConfig('country-state')->getTableName();
 
 				// countries
 				$sql = 'SELECT *
 						FROM ' . $country_table . '
 						WHERE Type = ' . DESTINATION_TYPE_COUNTRY . ' AND ' . $limit_where . '
 						ORDER BY `IsoCode`';
 				$countries = $this->Conn->Query($sql, 'CountryStateId');
 
 				// states
 				$sql = 'SELECT state.*
 						FROM ' . $country_table . ' state
 						JOIN ' . $country_table . ' country ON country.CountryStateId = state.StateCountryId
 						WHERE state.Type = ' . DESTINATION_TYPE_STATE . ' AND ' . str_replace('`IsoCode`', 'country.`IsoCode`', $limit_where) . '
 						ORDER BY state.`IsoCode`';
 				$states = $this->Conn->Query($sql, 'CountryStateId');
 
 				foreach ($states as $state_id => $state_data) {
 					$country_id = $state_data['StateCountryId'];
 
 					if ( !array_key_exists('States', $countries[$country_id]) ) {
 						$countries[$country_id]['States'] = Array ();
 					}
 
 					$countries[$country_id]['States'][] = $state_id;
 				}
 			}
 
 			foreach ($languages as $language_id => $language_info) {
 				// language
 				$ret .= "\t" . '<LANGUAGE Encoding="' . $this->_exportEncoding . '"';
 
 				foreach ($export_fields	as $export_field) {
 					$ret .= ' ' . $export_field . '="' . kUtil::escape($language_info[$export_field], kUtil::ESCAPE_HTML) . '"';
 				}
 
 				$ret .= '>' . "\n";
 
 				// filename replacements
 				$replacements = $language_info['FilenameReplacements'];
 
 				if ( $replacements ) {
 					$ret .= "\t\t" . '<REPLACEMENTS>' . $this->_exportConvert($replacements) . '</REPLACEMENTS>' . "\n";
 				}
 
 				// e-mail design templates
 				if ( $language_info['HtmlEmailTemplate'] || $language_info['TextEmailTemplate'] ) {
 					$ret .= "\t\t" . '<EMAILDESIGNS>' . "\n";
 
 					if ( $language_info['HtmlEmailTemplate'] ) {
 						$ret .= "\t\t\t" . '<HTML>' . $this->_exportConvert($language_info['HtmlEmailTemplate']) . '</HTML>' . "\n";
 					}
 
 					if ( $language_info['TextEmailTemplate'] ) {
 						$ret .= "\t\t\t" . '<TEXT>' . $this->_exportConvert($language_info['TextEmailTemplate']) . '</TEXT>' . "\n";
 					}
 
 					$ret .= "\t\t" . '</EMAILDESIGNS>' . "\n";
 				}
 
 				// phrases
 				if ($phrases) {
 					$ret .= "\t\t" . '<PHRASES>' . "\n";
 					foreach ($phrases as $phrase_id => $phrase) {
 						$translation = $phrase['l' . $language_id . '_Translation'];
 						$hint_translation = $phrase['l' . $language_id . '_HintTranslation'];
 						$column_translation = $phrase['l' . $language_id . '_ColumnTranslation'];
 
 						if (!$translation) {
 							// phrase is not translated on given language
 							continue;
 						}
 
 						if ( $this->_exportEncoding == 'base64' ) {
 							$hint_translation = base64_encode($hint_translation);
 							$column_translation = base64_encode($column_translation);
 						}
 						else {
 							$hint_translation = kUtil::escape($hint_translation, kUtil::ESCAPE_HTML);
 							$column_translation = kUtil::escape($column_translation, kUtil::ESCAPE_HTML);
 						}
 
 						$attributes = Array (
 							'Label="' . $phrase['Phrase'] . '"',
 							'Module="' . $phrase['Module'] . '"',
 							'Type="' . $phrase['PhraseType'] . '"'
 						);
 
 						if ( $phrase['l' . $language_id . '_HintTranslation'] ) {
 							$attributes[] = 'Hint="' . $hint_translation . '"';
 						}
 
 						if ( $phrase['l' . $language_id . '_ColumnTranslation'] ) {
 							$attributes[] = 'Column="' . $column_translation . '"';
 						}
 
 						$ret .= "\t\t\t" . '<PHRASE ' . implode(' ', $attributes) . '>' . $this->_exportConvert($translation) . '</PHRASE>' . "\n";
 					}
 
 					$ret .= "\t\t" . '</PHRASES>' . "\n";
 				}
 
 				// email events
 				if ($email_templates) {
 					$ret .= "\t\t" . '<EVENTS>' . "\n";
 
 					foreach ($email_templates as $template_data) {
 						$fields_hash = Array (
 							'HEADERS' => $template_data['Headers'],
 							'SUBJECT' => $template_data['l' . $language_id . '_Subject'],
 							'HTMLBODY' => $template_data['l' . $language_id . '_HtmlBody'],
 							'PLAINTEXTBODY' => $template_data['l' . $language_id . '_PlainTextBody'],
 						);
 
 						$data = '';
 
 						foreach ($fields_hash as $xml_node => $xml_content) {
 							if ( $xml_content ) {
 								$data .= "\t\t\t\t" . '<' . $xml_node . '>' . $this->_exportConvert($xml_content) . '</' . $xml_node . '>' . "\n";
 							}
 						}
 
 						if ( $data ) {
 							$ret .= "\t\t\t" . '<EVENT Event="' . $template_data['TemplateName'] . '" Type="' . $template_data['Type'] . '">' . "\n" . $data . "\t\t\t" . '</EVENT>' . "\n";
 						}
 					}
 
 					$ret .= "\t\t" . '</EVENTS>' . "\n";
 				}
 
 				if (in_array('Core', $module_ids) && $countries) {
 					$ret .= "\t\t" . '<COUNTRIES>' . "\n";
 					foreach ($countries as $country_data) {
 						$translation = $country_data['l' . $language_id . '_Name'];
 
 						if (!$translation) {
 							// country is not translated on given language
 							continue;
 						}
 
 						$data = $this->_exportEncoding == 'base64' ? base64_encode($translation) : $translation;
 
 						if (array_key_exists('States', $country_data)) {
 							$ret .= "\t\t\t" . '<COUNTRY Iso="' . $country_data['IsoCode'] . '" Translation="' . $data . '">' . "\n";
 
 							foreach ($country_data['States'] as $state_id) {
 								$translation = $states[$state_id]['l' . $language_id . '_Name'];
 
 								if (!$translation) {
 									// state is not translated on given language
 									continue;
 								}
 
 								$data = $this->_exportEncoding == 'base64' ? base64_encode($translation) : $translation;
 								$ret .= "\t\t\t\t" . '<STATE Iso="' . $states[$state_id]['IsoCode'] . '" Translation="' . $data . '"/>' . "\n";
 							}
 
 							$ret  .= "\t\t\t" . '</COUNTRY>' . "\n";
 						}
 						else {
 							$ret .= "\t\t\t" . '<COUNTRY Iso="' . $country_data['IsoCode'] . '" Translation="' . $data . '"/>' . "\n";
 						}
 					}
 
 					$ret .= "\t\t" . '</COUNTRIES>' . "\n";
 				}
 
 				$ret .= "\t" . '</LANGUAGE>' . "\n";
 			}
 
 			$ret .= '</LANGUAGES>';
 			fwrite($fp, $ret);
 			fclose($fp);
 
 			return true;
 		}
 
 		/**
 		 * Converts string before placing into export file
 		 *
 		 * @param string $string
 		 * @return string
 		 * @access protected
 		 */
 		protected function _exportConvert($string)
 		{
 			return $this->_exportEncoding == 'base64' ? base64_encode($string) : '<![CDATA[' . $string . ']]>';
 		}
 
 		/**
 		 * Sets language pack encoding (not charset) used during export
 		 *
 		 * @param string $encoding
 		 */
 		function setExportEncoding($encoding)
 		{
 			$this->_exportEncoding = $encoding;
 		}
 
 		/**
 		 * Sets language pack data limit for export
 		 *
 		 * @param string $prefix
 		 * @param string $data
 		 */
 		function setExportLimit($prefix, $data = null)
 		{
 			if ( !isset($data) ) {
 				$key_field = $prefix == 'phrases' ? 'Phrase' : 'TemplateName';
 				$ids = $this->getExportIDs($prefix);
 
 				$config = $this->Application->getUnitConfig($prefix);
 
 				$sql = 'SELECT ' . $key_field . '
 						FROM ' . $config->getTableName() . '
 						WHERE ' . $config->getIDField() . ' IN (' . $ids . ')';
 				$rows = $this->Conn->GetIterator($sql);
 
 				if ( count($rows) ) {
 					$data = '';
 
 					foreach ($rows as $row) {
 						$data .= ',' . $row[$key_field];
 					}
 
 					$data = substr($data, 1);
 				}
 			}
 
 			if ( !is_array($data) ) {
 				$data = str_replace(',', "\n", $data);
 				$data = preg_replace("/\n+/", "\n", str_replace("\r", '', trim($data)));
 				$data = $data ? array_map('trim', explode("\n", $data)) : Array ();
 			}
 
 			$this->_exportLimits[$prefix] = $data;
 		}
 
 		/**
 		 * Performs upgrade of given language pack part
 		 *
 		 * @param int $language_id
 		 * @param string $prefix
 		 * @param string $unique_field
 		 * @param Array $data_fields
 		 */
 		function _performUpgrade($language_id, $prefix, $unique_field, $data_fields)
 		{
 			$live_records = $this->_getTableData($language_id, $prefix, $unique_field, $data_fields[0], false);
 			$temp_records = $this->_getTableData($language_id, $prefix, $unique_field, $data_fields[0], true);
 
 			if ( !$temp_records ) {
 				// no data for given language
 				return;
 			}
 
 			// perform insert for records, that are missing in live table
 			$config = $this->Application->getUnitConfig($prefix);
 			$to_insert = array_diff($temp_records, $live_records);
 
 			if ( $to_insert ) {
 				$to_insert = $this->Conn->qstrArray($to_insert);
 
 				$sql = 'INSERT INTO ' . $config->getTableName() . '
 						SELECT *
 						FROM ' . $this->_tables[$prefix] . '
 						WHERE ' . $unique_field . ' IN (' . implode(',', $to_insert) . ')';
 				$this->Conn->Query($sql);
 
 				// new records were added
 				$this->changedPrefixes[] = $prefix;
 			}
 
 			// perform update for records, that are present in live table
 			$to_update = array_diff($temp_records, $to_insert);
 
 			if ( $to_update ) {
 				$to_update = $this->Conn->qstrArray($to_update);
 
 				$sql = 'UPDATE ' . $config->getTableName() . ' live
 						SET ';
 
 				foreach ($data_fields as $index => $data_field) {
 					$data_field = sprintf($data_field, $language_id);
 
 					$sql .= '	live.' . $data_field . ' = (
 									SELECT temp' . $index . '.' . $data_field . '
 									FROM ' . $this->_tables[$prefix] . ' temp' . $index . '
 									WHERE temp' . $index . '.' . $unique_field . ' = live.' . $unique_field . '
 								),';
 				}
 
 				$sql = substr($sql, 0, -1); // cut last comma
 
 				$where_clause = Array (
 					// this won't make any difference, but just in case
 					$unique_field . ' IN (' . implode(',', $to_update) . ')',
 				);
 
 				if ( !$this->hasOption(self::OVERWRITE_EXISTING) ) {
 					// empty OR not set
 					$data_field = sprintf($data_fields[0], $language_id);
 					$where_clause[] = '(' . $data_field . ' = "") OR (' . $data_field . ' IS NULL)';
 				}
 
 				if ( $where_clause ) {
 					$sql .= "\n" . 'WHERE (' . implode(') AND (', $where_clause) . ')';
 				}
 
 				$this->Conn->Query($sql);
 
 				if ( $this->Conn->getAffectedRows() > 0 ) {
 					// existing records were updated
 					$this->changedPrefixes[] = $prefix;
 				}
 			}
 		}
 
 		/**
 		 * Returns data from given table used for language pack upgrade
 		 *
 		 * @param int $language_id
 		 * @param string $prefix
 		 * @param string $unique_field
 		 * @param string $data_field
 		 * @param bool $temp_mode
 		 * @return Array
 		 */
 		function _getTableData($language_id, $prefix, $unique_field, $data_field, $temp_mode = false)
 		{
 			$data_field = sprintf($data_field, $language_id);
 			$table_name = $this->Application->getUnitConfig($prefix)->getTableName();
 
 			if ($temp_mode) {
 				// for temp table get only records, that have contents on given language (not empty and isset)
 				$sql = 'SELECT ' . $unique_field . '
 						FROM ' . $this->Application->GetTempName($table_name, 'prefix:' . $prefix) . '
 						WHERE (' . $data_field . ' <> "") AND (' . $data_field . ' IS NOT NULL)';
 			}
 			else {
 				// for live table get all records, no matter on what language
 				$sql = 'SELECT ' . $unique_field . '
 						FROM ' . $table_name;
 			}
 
 			return $this->Conn->GetCol($sql);
 		}
 
 		function _parseXML($filename)
 		{
 			if ( $this->_debugMode ) {
 				$start_time = microtime(true);
 				$this->Application->Debugger->appendHTML(__CLASS__ . '::' . __FUNCTION__ . '("' . $filename . '")');
 			}
 
 			$languages = simplexml_load_file($filename);
 
 			if ( $languages === false) {
 				// invalid language pack contents
 				return false;
 			}
 
 			// PHP 5.3 version would be: $languages->count()
 			if ( count($languages->children()) ) {
 				$this->_processLanguages($languages);
 				$this->_processLanguageData($languages);
 			}
 
 			if ( $this->_debugMode ) {
 				$this->Application->Debugger->appendHTML(__CLASS__ . '::' . __FUNCTION__ . '("' . $filename . '"): ' . (microtime(true) - $start_time));
 			}
 
 			return true;
 		}
 
 		/**
 		 * Creates temporary tables, used during language import
 		 *
 		 * @param bool $drop_only
 		 */
 		function _initImportTables($drop_only = false)
 		{
 			$this->_tables['phrases'] = $this->_prepareTempTable('phrases', $drop_only);
 			$this->_tables['email-template'] = $this->_prepareTempTable('email-template', $drop_only);
 			$this->_tables['country-state'] = $this->_prepareTempTable('country-state', $drop_only);
 		}
 
 		/**
 		 * Create temp table for prefix, if table already exists, then delete it and create again
 		 *
 		 * @param string $prefix
 		 * @param bool $drop_only
 		 * @return string Name of created temp table
 		 * @access protected
 		 */
 		protected function _prepareTempTable($prefix, $drop_only = false)
 		{
 			$config = $this->Application->getUnitConfig($prefix);
 			$id_field = $config->getIDField();
 			$table = $config->getTableName();
 			$temp_table = $this->Application->GetTempName($table);
 
 			$sql = 'DROP TABLE IF EXISTS %s';
 			$this->Conn->Query( sprintf($sql, $temp_table) );
 
 			if (!$drop_only) {
 				$sql = 'CREATE TABLE ' . $temp_table . ' SELECT * FROM ' . $table . ' WHERE 0';
 				$this->Conn->Query($sql);
 
 				$sql = 'ALTER TABLE %1$s CHANGE %2$s %2$s INT(11) NOT NULL DEFAULT "0"';
 				$this->Conn->Query( sprintf($sql, $temp_table, $id_field) );
 
 				switch ($prefix) {
 					case 'phrases':
 						$unique_field = 'PhraseKey';
 						break;
 
 					case 'email-template':
 						$unique_field = 'TemplateId';
 						break;
 
 					case 'country-state':
 						$unique_field = 'CountryStateId';
 						break;
 
 					default:
 						throw new Exception('Unknown prefix "<strong>' . $prefix . '</strong>" during language pack import');
 						break;
 				}
 
 				$sql = 'ALTER TABLE ' . $temp_table . ' ADD UNIQUE (' . $unique_field . ')';
 				$this->Conn->Query($sql);
 			}
 
 			return $temp_table;
 		}
 
 		/**
 		 * Prepares mapping between event name+type and their ids in database
 		 *
 		 */
 		function _updateEventsCache()
 		{
 			$table_name = $this->Application->getUnitConfig('email-template')->getTableName();
 
 			// During upgrade from 5.1.x to 5.2.x without this there will be tons of notices.
 			if ( defined('IS_INSTALL') && IS_INSTALL && !$this->Conn->TableFound($table_name, true) ) {
 				$this->events_hash = array();
 
 				return;
 			}
 
 			$sql = 'SELECT TemplateId, CONCAT(TemplateName,"_",Type) AS EventMix
 					FROM ' . $table_name;
 			$this->events_hash = $this->Conn->GetCol($sql, 'EventMix');
 		}
 
 		/**
 		 * Returns language fields to be exported
 		 *
 		 * @return Array
 		 */
 		function _getExportFields()
 		{
 			return Array (
 				'PackName', 'LocalName', 'DateFormat', 'ShortDateFormat', 'TimeFormat', 'ShortTimeFormat',
 				'InputDateFormat', 'InputTimeFormat', 'DecimalPoint', 'ThousandSep', 'UnitSystem', 'Locale',
 				'UserDocsUrl'
 			);
 		}
 
 		/**
 		 * Processes parsed XML
 		 *
 		 * @param SimpleXMLElement $languages
 		 */
 		function _processLanguages($languages)
 		{
 			$version = (int)$languages['Version'];
 
 			if ( !$version ) {
 				// version missing -> guess it
 				if ( $languages->DATEFORMAT->getName() ) {
 					$version = 1;
 				}
 				elseif ( (string)$languages->LANGUAGE['Charset'] != '' ) {
 					$version = 2;
 				}
 			}
 
 			if ( $version == 1 ) {
 				$field_mapping = Array (
 					'DATEFORMAT' => 'DateFormat',
 					'TIMEFORMAT' => 'TimeFormat',
 					'INPUTDATEFORMAT' => 'InputDateFormat',
 					'INPUTTIMEFORMAT' => 'InputTimeFormat',
 					'DECIMAL' => 'DecimalPoint',
 					'THOUSANDS' => 'ThousandSep',
 					'CHARSET' => 'Charset',
 					'UNITSYSTEM' => 'UnitSystem',
 					'DOCS_URL' => 'UserDocsUrl',
 				);
 			}
 			else {
 				$export_fields = $this->_getExportFields();
 			}
 
 			foreach ($languages as $language_node) {
 				$fields_hash = Array (
 					'PackName' => (string)$language_node['PackName'],
 					'LocalName' => (string)$language_node['PackName'],
 					'Encoding' => (string)$language_node['Encoding'],
 					'SynchronizationModes' => Language::SYNCHRONIZE_DEFAULT,
 				);
 
 				if ( $version > 1 ) {
 					foreach ($export_fields as $export_field) {
 						if ( (string)$language_node[$export_field] ) {
 							$fields_hash[$export_field] = (string)$language_node[$export_field];
 						}
 					}
 				}
 
 				$container_nodes = Array ('PHRASES', 'EVENTS', 'COUNTRIES');
 
 				foreach ($language_node as $sub_node) {
-					/* @var $sub_node SimpleXMLElement */
+					/** @var SimpleXMLElement $sub_node */
 
 					if ( in_array($sub_node->getName(), $container_nodes) ) {
 							continue;
 					}
 
 					switch ($sub_node->getName()) {
 						case 'REPLACEMENTS':
 							// added since v2
 							$replacements = (string)$sub_node;
 
 							if ( $fields_hash['Encoding'] != 'plain' ) {
 								$replacements = base64_decode($replacements);
 							}
 
 							$fields_hash['FilenameReplacements'] = $replacements;
 							break;
 
 						case 'EMAILDESIGNS':
 							// added since v6
 							$this->_decodeEmailDesignTemplate($fields_hash, 'HtmlEmailTemplate', (string)$sub_node->HTML);
 							$this->_decodeEmailDesignTemplate($fields_hash, 'TextEmailTemplate', (string)$sub_node->TEXT);
 							break;
 
 						default:
 							if ( $version == 1 ) {
 								$fields_hash[$field_mapping[$sub_node->Name]] = (string)$sub_node;
 							}
 							break;
 					}
 				}
 
 				$this->_processLanguage($fields_hash);
 			}
 
 			if ( !defined('IS_INSTALL') || !IS_INSTALL ) {
+				/** @var kMultiLanguageHelper $ml_helper */
 				$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
-				/* @var $ml_helper kMultiLanguageHelper */
 
 				// create ML columns for new languages
 				$ml_helper->resetState();
 				$ml_helper->massCreateFields();
 			}
 
 			// create temp tables after new language columns were added
 			$this->_initImportTables();
 		}
 
 		/**
 		 * Processes parsed XML
 		 *
 		 * @param SimpleXMLElement $languages
 		 */
 		function _processLanguageData($languages)
 		{
 			foreach ($languages as $language_node) {
 				$encoding = (string)$language_node['Encoding'];
 				$language_id = $this->_languages[kUtil::crc32((string)$language_node['PackName'])];
 
 				$container_nodes = Array ('PHRASES', 'EVENTS', 'COUNTRIES');
 
 				foreach ($language_node as $sub_node) {
-					/* @var $sub_node SimpleXMLElement */
+					/** @var SimpleXMLElement $sub_node */
 
 					if ( !in_array($sub_node->getName(), $container_nodes) || !count($sub_node->children()) ) {
 						// PHP 5.3 version would be: !$sub_node->count()
 						continue;
 					}
 
 					switch ($sub_node->getName()) {
 						case 'PHRASES':
 							$this->_processPhrases($sub_node, $language_id, $encoding);
 							break;
 
 						case 'EVENTS':
 							$this->_processEvents($sub_node, $language_id, $encoding);
 							break;
 
 						case 'COUNTRIES':
 							$this->_processCountries($sub_node, $language_id, $encoding);
 							break;
 					}
 				}
 			}
 		}
 
 		/**
 		 * Decodes e-mail template design from language pack
 		 *
 		 * @param Array $fields_hash
 		 * @param string $field
 		 * @param string $design_template
 		 */
 		protected function _decodeEmailDesignTemplate(&$fields_hash, $field, $design_template)
 		{
 			if ( $fields_hash['Encoding'] != 'plain' ) {
 				$design_template = base64_decode($design_template);
 			}
 
 			if ( $design_template ) {
 				$fields_hash[$field] = $design_template;
 			}
 		}
 
 		/**
 		 * Performs phases import
 		 *
 		 * @param SimpleXMLElement $phrases
 		 * @param int $language_id
 		 * @param string $language_encoding
 		 */
 		function _processPhrases($phrases, $language_id, $language_encoding)
 		{
 			static $other_translations = Array ();
 
 			$primary_language = $this->Application->GetDefaultLanguageId();
 			$translate_from = $this->hasOption(self::SYNC_ADDED) || $primary_language == $language_id ? 0 : $primary_language;
 
 			if ( $this->Application->isDebugMode() ) {
 				$this->Application->Debugger->profileStart('L[' . $language_id . ']P', 'Language: ' . $language_id . '; Phrases Import');
 			}
 
 			foreach ($phrases as $phrase_node) {
-				/* @var $phrase_node SimpleXMLElement */
+				/** @var SimpleXMLElement $phrase_node */
 
 				$phrase_key = mb_strtoupper($phrase_node['Label']);
 
 				$fields_hash = Array (
 					'Phrase' => (string)$phrase_node['Label'],
 					'PhraseKey' => $phrase_key,
 					'PhraseType' => (int)$phrase_node['Type'],
 					'Module' => (string)$phrase_node['Module'] ? (string)$phrase_node['Module'] : 'Core',
 					'LastChanged' => TIMENOW,
 					'LastChangeIP' => $this->ip_address,
 				);
 
 				$translation = (string)$phrase_node;
 				$hint_translation = (string)$phrase_node['Hint'];
 				$column_translation = (string)$phrase_node['Column'];
 
 				if ( array_key_exists($fields_hash['PhraseType'], $this->phrase_types_allowed) ) {
 					if ( $language_encoding != 'plain' ) {
 						$translation = base64_decode($translation);
 						$hint_translation = base64_decode($hint_translation);
 						$column_translation = base64_decode($column_translation);
 					}
 
 					if ( !array_key_exists($phrase_key, $other_translations) ) {
 						// ensure translation in every language to make same column count in every insert
 						$other_translations[$phrase_key] = Array ();
 
 						foreach ($this->_languages as $other_language_id) {
 							$other_translations[$phrase_key]['l' . $other_language_id . '_Translation'] = '';
 							$other_translations[$phrase_key]['l' . $other_language_id . '_HintTranslation'] = '';
 							$other_translations[$phrase_key]['l' . $other_language_id . '_ColumnTranslation'] = '';
 							$other_translations[$phrase_key]['l' . $other_language_id . '_TranslateFrom'] = 0;
 						}
 					}
 
 					$other_translations[$phrase_key]['l' . $language_id . '_Translation'] = $translation;
 					$other_translations[$phrase_key]['l' . $language_id . '_HintTranslation'] = $hint_translation;
 					$other_translations[$phrase_key]['l' . $language_id . '_ColumnTranslation'] = $column_translation;
 					$other_translations[$phrase_key]['l' . $language_id . '_TranslateFrom'] = $translate_from;
 
 					$fields_hash = array_merge($fields_hash, $other_translations[$phrase_key]);
 					$this->Conn->doInsert($fields_hash, $this->_tables['phrases'], 'REPLACE', false);
 				}
 			}
 
 			if ( $this->Application->isDebugMode() ) {
 				$this->Application->Debugger->profileFinish('L[' . $language_id . ']P', 'Language: ' . $language_id . '; Phrases Import');
 			}
 
 			$this->Conn->doInsert($fields_hash, $this->_tables['phrases'], 'REPLACE');
 		}
 
 		/**
 		 * Performs email event import
 		 *
 		 * @param SimpleXMLElement $events
 		 * @param int $language_id
 		 * @param string $language_encoding
 		 */
 		function _processEvents($events, $language_id, $language_encoding)
 		{
 			static $other_translations = Array ();
 
 			$primary_language = $this->Application->GetDefaultLanguageId();
 			$translate_from = $this->hasOption(self::SYNC_ADDED) || $primary_language == $language_id ? 0 : $primary_language;
 
 			if ( $this->Application->isDebugMode() ) {
 				$this->Application->Debugger->profileStart('L[' . $language_id . ']E', 'Language: ' . $language_id . '; Events Import');
 			}
 
+			/** @var kEmailTemplateHelper $email_template_helper */
 			$email_template_helper = $this->Application->recallObject('kEmailTemplateHelper');
-			/* @var $email_template_helper kEmailTemplateHelper */
 
 			foreach ($events as $event_node) {
-				/* @var $event_node SimpleXMLElement */
+				/** @var SimpleXMLElement $event_node */
 
 				$message_type = (string)$event_node['MessageType'];
 				$email_template_id = $this->_getEmailTemplateId((string)$event_node['Event'], (int)$event_node['Type']);
 
 				if ( !$email_template_id ) {
 					continue;
 				}
 
 				$fields_hash = Array (
 					'TemplateId' => $email_template_id,
 					'TemplateName' => (string)$event_node['Event'],
 					'Type' => (int)$event_node['Type'],
 				);
 
 				if ( $message_type == '' ) {
 					$parsed = $email_template_helper->parseTemplate($event_node, '');
 					$parsed = array_map($language_encoding == 'plain' ? 'rtrim' : 'base64_decode', $parsed);
 
 				}
 				else {
 					$template = $language_encoding == 'plain' ? rtrim($event_node) : base64_decode($event_node);
 					$parsed = $email_template_helper->parseTemplate($template, $message_type);
 				}
 
 				if ( !array_key_exists($email_template_id, $other_translations) ) {
 					// ensure translation in every language to make same column count in every insert
 					$other_translations[$email_template_id] = Array ();
 
 					foreach ($this->_languages as $other_language_id) {
 						$other_translations[$email_template_id]['l' . $other_language_id . '_Subject'] = '';
 						$other_translations[$email_template_id]['l' . $other_language_id . '_HtmlBody'] = '';
 						$other_translations[$email_template_id]['l' . $other_language_id . '_PlainTextBody'] = '';
 						$other_translations[$email_template_id]['l' . $other_language_id . '_TranslateFrom'] = 0;
 					}
 				}
 
 				$other_translations[$email_template_id]['l' . $language_id . '_Subject'] = $parsed['Subject'];
 				$other_translations[$email_template_id]['l' . $language_id . '_HtmlBody'] = $parsed['HtmlBody'];
 				$other_translations[$email_template_id]['l' . $language_id . '_PlainTextBody'] = $parsed['PlainTextBody'];
 				$other_translations[$email_template_id]['l' . $language_id . '_TranslateFrom'] = $translate_from;
 
 				if ( $parsed['Headers'] ) {
 					$other_translations[$email_template_id]['Headers'] = $parsed['Headers'];
 				}
 				elseif ( !$parsed['Headers'] && !array_key_exists('Headers', $other_translations[$email_template_id]) ) {
 					$other_translations[$email_template_id]['Headers'] = $parsed['Headers'];
 				}
 
 				$fields_hash = array_merge($fields_hash, $other_translations[$email_template_id]);
 				$this->Conn->doInsert($fields_hash, $this->_tables['email-template'], 'REPLACE', false);
 			}
 
 			if ( $this->Application->isDebugMode() ) {
 				$this->Application->Debugger->profileFinish('L[' . $language_id . ']E', 'Language: ' . $language_id . '; Events Import');
 			}
 
 			if ( isset($fields_hash) ) {
 				// at least one email event in language pack was found in database
 				$this->Conn->doInsert($fields_hash, $this->_tables['email-template'], 'REPLACE');
 			}
 		}
 
 		/**
 		 * Performs country_state translation import
 		 *
 		 * @param SimpleXMLElement $country_states
 		 * @param int $language_id
 		 * @param string $language_encoding
 		 * @param bool $process_states
 		 * @return void
 		 */
 		function _processCountries($country_states, $language_id, $language_encoding, $process_states = false)
 		{
 			static $other_translations = Array ();
 
 			foreach ($country_states as $country_state_node) {
-				/* @var $country_state_node SimpleXMLElement */
+				/** @var SimpleXMLElement $country_state_node */
 
 				if ( $process_states ) {
 					$country_state_id = $this->_getStateId((string)$country_states['Iso'], (string)$country_state_node['Iso']);
 				}
 				else {
 					$country_state_id = $this->_getCountryId((string)$country_state_node['Iso']);
 				}
 
 				if ( !$country_state_id ) {
 					continue;
 				}
 
 				if ( $language_encoding == 'plain' ) {
 					$translation = rtrim($country_state_node['Translation']);
 				}
 				else {
 					$translation = base64_decode($country_state_node['Translation']);
 				}
 
 				$fields_hash = Array ('CountryStateId' => $country_state_id);
 
 
 				if ( !array_key_exists($country_state_id, $other_translations) ) {
 					// ensure translation in every language to make same column count in every insert
 					$other_translations[$country_state_id] = Array ();
 
 					foreach ($this->_languages as $other_language_id) {
 						$other_translations[$country_state_id]['l' . $other_language_id . '_Name'] = '';
 					}
 				}
 
 				$other_translations[$country_state_id]['l' . $language_id . '_Name'] = $translation;
 
 				$fields_hash = array_merge($fields_hash, $other_translations[$country_state_id]);
 				$this->Conn->doInsert($fields_hash, $this->_tables['country-state'], 'REPLACE', false);
 
 				// PHP 5.3 version would be: $country_state_node->count()
 				if ( !$process_states && count($country_state_node->children()) ) {
 					$this->_processCountries($country_state_node, $language_id, $language_encoding, true);
 				}
 			}
 
 			$this->Conn->doInsert($fields_hash, $this->_tables['country-state'], 'REPLACE');
 		}
 
 		/**
 		 * Creates/updates language based on given fields and returns it's id
 		 *
 		 * @param Array $fields_hash
 		 * @return int
 		 */
 		function _processLanguage($fields_hash)
 		{
 			// 1. get language from database
 			$sql = 'SELECT ' . $this->lang_object->IDField . '
 					FROM ' . $this->lang_object->TableName . '
 					WHERE PackName = ' . $this->Conn->qstr($fields_hash['PackName']);
 			$language_id = $this->Conn->GetOne($sql);
 
 			if ( $language_id ) {
 				// 2. language found -> update, when allowed
 				$this->lang_object->Load($language_id);
 
 				if ( $this->hasOption(self::OVERWRITE_EXISTING) ) {
 					// update live language record based on data from xml
 					$this->lang_object->SetFieldsFromHash($fields_hash);
 					$this->lang_object->Update();
 				}
 			}
 			else {
 				// 3. language not found -> create
 				$this->lang_object->SetFieldsFromHash($fields_hash);
 				$this->lang_object->SetDBField('Enabled', STATUS_ACTIVE);
 
 				if ( $this->lang_object->Create() ) {
 					$language_id = $this->lang_object->GetID();
 
 					if ( defined('IS_INSTALL') && IS_INSTALL ) {
 						// language created during install becomes admin interface language
 						$this->lang_object->setPrimary(true, true);
 					}
 				}
 			}
 
 			// 4. collect ID of every processed language
 			if ( !in_array($language_id, $this->_languages) ) {
 				$this->_languages[kUtil::crc32($fields_hash['PackName'])] = $language_id;
 			}
 
 			return $language_id;
 		}
 
 		/**
 		 * Returns e-mail template id based on it's name and type
 		 *
 		 * @param string $template_name
 		 * @param string $template_type
 		 * @return int
 		 */
 		function _getEmailTemplateId($template_name, $template_type)
 		{
 			$cache_key = $template_name . '_' . $template_type;
 
 			return array_key_exists($cache_key, $this->events_hash) ? $this->events_hash[$cache_key] : 0;
 		}
 
 		/**
 		 * Returns country id based on it's 3letter ISO code
 		 *
 		 * @param string $iso
 		 * @return int
 		 */
 		function _getCountryId($iso)
 		{
 			static $cache = null;
 
 			if (!isset($cache)) {
 				$sql = 'SELECT CountryStateId, IsoCode
 						FROM ' . TABLE_PREFIX . 'CountryStates
 						WHERE Type = ' . DESTINATION_TYPE_COUNTRY;
 				$cache = $this->Conn->GetCol($sql, 'IsoCode');
 			}
 
 			return array_key_exists($iso, $cache) ? $cache[$iso] : false;
 		}
 
 		/**
 		 * Returns state id based on 3letter country ISO code and 2letter state ISO code
 		 *
 		 * @param string $country_iso
 		 * @param string $state_iso
 		 * @return int
 		 */
 		function _getStateId($country_iso, $state_iso)
 		{
 			static $cache = null;
 
 			if (!isset($cache)) {
 				$sql = 'SELECT CountryStateId, CONCAT(StateCountryId, "-", IsoCode) AS IsoCode
 						FROM ' . TABLE_PREFIX . 'CountryStates
 						WHERE Type = ' . DESTINATION_TYPE_STATE;
 				$cache = $this->Conn->GetCol($sql, 'IsoCode');
 			}
 
 			$country_id = $this->_getCountryId($country_iso);
 
 			return array_key_exists($country_id . '-' . $state_iso, $cache) ? $cache[$country_id . '-' . $state_iso] : false;
 		}
 
 		/**
 		 * Returns comma-separated list of IDs, that will be exported
 		 *
 		 * @param string $prefix
 		 * @return string
 		 * @access public
 		 */
 		public function getExportIDs($prefix)
 		{
 			$ids = $this->Application->RecallVar($prefix . '_selected_ids');
 
 			if ( $ids ) {
 				// some records were selected in grid
 				return $ids;
 			}
 
 			$tag_params = Array (
 				'grid' => $prefix == 'phrases' ? 'Phrases' : 'Emails',
 				'skip_counting' => 1,
 				'per_page' => -1
 			);
 
+			/** @var kDBList $list */
 			$list = $this->Application->recallObject($prefix, $prefix . '_List', $tag_params);
-			/* @var $list kDBList */
 
 			$sql = $list->getCountSQL($list->GetSelectSQL());
 			$sql = str_replace('COUNT(*) AS count', $list->TableName . '.' . $list->IDField, $sql);
 
 			$ids = '';
 			$rows = $this->Conn->GetIterator($sql);
 
 			if ( count($rows) ) {
 				foreach ($rows as $row) {
 					$ids .= ',' . $row[$list->IDField];
 				}
 
 				$ids = substr($ids, 1);
 			}
 
 			return $ids;
 		}
 	}
Index: branches/5.3.x/core/units/helpers/user_helper.php
===================================================================
--- branches/5.3.x/core/units/helpers/user_helper.php	(revision 16518)
+++ branches/5.3.x/core/units/helpers/user_helper.php	(revision 16519)
@@ -1,795 +1,795 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class UserHelper extends kHelper {
 
 		/**
 		 * Event to be used during login processings
 		 *
 		 * @var kEvent
 		 */
 		var $event = null;
 
 		/**
 		 * Performs user login and returns the result
 		 *
 		 * @param string $username
 		 * @param string $password
 		 * @param bool $dry_run
 		 * @param bool $remember_login
 		 * @param string $remember_login_cookie
 		 * @return int
 		 */
 		function loginUser($username, $password, $dry_run = false, $remember_login = false, $remember_login_cookie = '')
 		{
 			if ( !isset($this->event) ) {
 				$this->event = new kEvent('u:OnLogin');
 			}
 
 			if ( !$password && !$remember_login_cookie ) {
 				return LoginResult::INVALID_PASSWORD;
 			}
 
 			$object =& $this->getUserObject();
 
 			// process "Save Username" checkbox
 			if ( $this->Application->isAdmin ) {
 				$save_username = $this->Application->GetVar('cb_save_username') ? $username : '';
 				$this->Application->Session->SetCookie('save_username', $save_username, strtotime('+1 year'));
 
 				// cookie will be set on next refresh, but refresh won't occur if
 				// login error present, so duplicate cookie in kHTTPQuery
 				$this->Application->SetVar('save_username', $save_username);
 			}
 
 			// logging in "root" (admin only)
 			$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;
 				}
 
 				$user_id = USER_ROOT;
 				$object->Clear($user_id);
 				$object->SetDBField('Username', 'root');
 
 				if ( !$dry_run ) {
 					$this->loginUserById($user_id, $remember_login_cookie);
 
 					if ( $super_admin ) {
 						$this->Application->StoreVar('super_admin', 1);
 					}
 
 					// reset counters
 					$this->Application->resetCounters('UserSessions');
 
 					$this->_processLoginRedirect('root', $password);
 					$this->_processInterfaceLanguage();
 					$this->_fixNextTemplate();
 				}
 
 				return LoginResult::OK;
 			}
 
 			$user_id = $this->getUserId($username, $password, $remember_login_cookie);
 
 			if ( $user_id ) {
 				$object->Load($user_id);
 
 				if ( !$this->checkBanRules($object) ) {
 					return LoginResult::BANNED;
 				}
 
 				if ( $object->GetDBField('Status') == STATUS_ACTIVE ) {
 					if ( !$this->checkLoginPermission() ) {
 						return LoginResult::NO_PERMISSION;
 					}
 
 					if ( !$dry_run ) {
 						$this->loginUserById($user_id, $remember_login_cookie);
 
 						if ( $remember_login ) {
 							// remember username & password when "Remember Login" checkbox us checked (when user is using login form on Front-End)
 							$sql = 'SELECT MD5(Password)
 									FROM ' . TABLE_PREFIX . 'Users
 									WHERE PortalUserId = ' . $user_id;
 							$remember_login_hash = $this->Conn->GetOne($sql);
 
 							$this->Application->Session->SetCookie('remember_login', $username . '|' . $remember_login_hash, strtotime('+1 month'));
 						}
 
 						if ( !$remember_login_cookie ) {
 							// reset counters
 							$this->Application->resetCounters('UserSessions');
 
 							$this->_processLoginRedirect($username, $password);
 							$this->_processInterfaceLanguage();
 							$this->_fixNextTemplate();
 						}
 					}
 
 					return LoginResult::OK;
 				}
 				else {
 					$pending_template = $this->Application->GetVar('pending_disabled_template');
 
 					if ( $pending_template !== false && !$dry_run ) {
 						// when user found, but it's not yet approved redirect hit to notification template
 						$this->event->redirect = $pending_template;
 
 						return LoginResult::OK;
 					}
 					else {
 						// when no notification template given return an error
 						return LoginResult::INVALID_PASSWORD;
 					}
 				}
 			}
 
 			if ( !$dry_run ) {
 				$this->event->SetRedirectParam('pass', 'all');
 //				$this->event->SetRedirectParam('pass_category', 1); // to test
 			}
 
 			return LoginResult::INVALID_PASSWORD;
 		}
 
 		/**
 		 * Login user by it's id
 		 *
 		 * @param int $user_id
 		 * @param bool $remember_login_cookie
 		 */
 		function loginUserById($user_id, $remember_login_cookie = false)
 		{
 			$object =& $this->getUserObject();
 
 			$this->Application->SetVar('u.current_id', $user_id);
 
 			if ( !$this->Application->isAdmin ) {
 				// needed for "profile edit", "registration" forms ON FRONT ONLY
 				$this->Application->SetVar('u_id', $user_id);
 			}
 
 			$this->Application->StoreVar('user_id', $user_id);
 			$this->Application->Session->SetField('PortalUserId', $user_id);
 
 			if ($user_id != USER_ROOT) {
 				$groups = $this->Application->RecallVar('UserGroups');
 				list ($first_group, ) = explode(',', $groups);
 
 				$this->Application->Session->SetField('GroupId', $first_group);
 				$this->Application->Session->SetField('GroupList', $groups);
 				$this->Application->Session->SetField('TimeZone', $object->GetDBField('TimeZone'));
 			}
 
 			$this->Application->LoadPersistentVars();
 
 			if (!$remember_login_cookie) {
 				// don't change last login time when auto-login is used
 				$this_login = (int)$this->Application->RecallPersistentVar('ThisLogin');
 				$this->Application->StorePersistentVar('LastLogin', $this_login);
 				$this->Application->StorePersistentVar('ThisLogin', time());
 			}
 
 			$hook_event = new kEvent('u:OnAfterLogin');
 			$hook_event->MasterEvent = $this->event;
 			$this->Application->HandleEvent($hook_event);
 		}
 
 		/**
 		 * Checks login permission
 		 *
 		 * @return bool
 		 */
 		function checkLoginPermission()
 		{
 			$object =& $this->getUserObject();
 			$ip_restrictions = $object->GetDBField('IPRestrictions');
 
 			if ( $ip_restrictions && !$this->Application->isDebugMode() && !kUtil::ipMatch($ip_restrictions, "\n") ) {
 				return false;
 			}
 
 			$groups = $object->getMembershipGroups(true);
 			if ( !$groups ) {
 				$groups = Array ();
 			}
 
 			$default_group = $this->getUserTypeGroup();
 			if ( $default_group !== false ) {
 				array_push($groups, $default_group);
 			}
 
 			// store groups, because kApplication::CheckPermission will use them!
 			array_push($groups, $this->Application->ConfigValue('User_LoggedInGroup'));
 			$groups = array_unique($groups);
 			$this->Application->StoreVar('UserGroups', implode(',', $groups), true); // true for optional
 
 			return $this->Application->CheckPermission($this->Application->isAdmin ? 'ADMIN' : 'LOGIN', 1);
 		}
 
 		/**
 		 * Returns default user group for it's type
 		 *
 		 * @return bool|string
 		 * @access protected
 		 */
 		protected function getUserTypeGroup()
 		{
 			$group_id = false;
 			$object =& $this->getUserObject();
 
 			if ( $object->GetDBField('UserType') == UserType::USER ) {
 				$group_id = $this->Application->ConfigValue('User_NewGroup');
 			}
 			elseif ( $object->GetDBField('UserType') == UserType::ADMIN ) {
 				$group_id = $this->Application->ConfigValue('User_AdminGroup');
 			}
 
 			$ip_restrictions = $this->getGroupsWithIPRestrictions();
 
 			if ( !isset($ip_restrictions[$group_id]) || kUtil::ipMatch($ip_restrictions[$group_id], "\n") ) {
 				return $group_id;
 			}
 
 			return false;
 		}
 
 		/**
 		 * Returns groups with IP restrictions
 		 *
 		 * @return Array
 		 * @access public
 		 */
 		public function getGroupsWithIPRestrictions()
 		{
 			static $cache = null;
 
 			if ( $this->Application->isDebugMode() ) {
 				return Array ();
 			}
 
 			if ( !isset($cache) ) {
 				$sql = 'SELECT IPRestrictions, GroupId
 						FROM ' . TABLE_PREFIX . 'UserGroups
 						WHERE IPRestrictions IS NOT NULL';
 				$cache = $this->Conn->GetCol($sql, 'GroupId');
 			}
 
 			return $cache;
 		}
 
 		/**
 		 * Performs user logout
 		 *
 		 */
 		function logoutUser()
 		{
 			if (!isset($this->event)) {
 				$this->event = new kEvent('u:OnLogout');
 			}
 
 			$hook_event = new kEvent('u:OnBeforeLogout');
 			$hook_event->MasterEvent = $this->event;
 			$this->Application->HandleEvent($hook_event);
 
 			$this->_processLoginRedirect();
 
 			$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);
 
 			$this->Application->DestroySession();
 
 			$this->Application->StoreVar('user_id', $user_id, true);
 			$this->Application->Session->SetField('PortalUserId', $user_id);
 
 			$group_list = $this->Application->ConfigValue('User_GuestGroup') . ',' . $this->Application->ConfigValue('User_LoggedInGroup');
 			$this->Application->StoreVar('UserGroups', $group_list, true);
 			$this->Application->Session->SetField('GroupList', $group_list);
 
 			if ($this->Application->ConfigValue('UseJSRedirect')) {
 				$this->event->SetRedirectParam('js_redirect', 1);
 			}
 
 			$this->Application->resetCounters('UserSessions');
 			$this->Application->Session->SetCookie('remember_login', '', strtotime('-1 hour'));
 
 			// don't pass user prefix on logout, since resulting url will have broken "env"
 			$this->event->SetRedirectParam('pass', MOD_REWRITE ? 'm' : 'all');
 
 			$this->_fixNextTemplate();
 		}
 
 		/**
 		 * Returns user id based on given criteria
 		 *
 		 * @param string $username
 		 * @param string $password
 		 * @param string $remember_login_cookie
 		 * @return int
 		 */
 		function getUserId($username, $password, $remember_login_cookie)
 		{
 			if ( $remember_login_cookie ) {
 				list ($username, $password) = explode('|', $remember_login_cookie); // 0 - username, 1 - md5(password_hash)
 			}
 
 			$sql = 'SELECT PortalUserId, Password, PasswordHashingMethod
 					FROM ' . TABLE_PREFIX . 'Users
 					WHERE Email = %1$s OR Username = %1$s';
 			$user_info = $this->Conn->GetRow(sprintf($sql, $this->Conn->qstr($username)));
 
 			if ( $user_info ) {
 				if ( $remember_login_cookie ) {
 					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'];
 
 					if ( $password_formatter->checkPassword($password, $user_info['Password'], $hashing_method) ) {
 						if ( $hashing_method != PasswordHashingMethod::PHPPASS ) {
 							$this->_fixUserPassword($user_info['PortalUserId'], $password);
 						}
 
 						return $user_info['PortalUserId'];
 					}
 				}
 			}
 
 			return false;
 		}
 
 		/**
 		 * Apply new password hashing to given user's password
 		 *
 		 * @param int $user_id
 		 * @param string $password
 		 * @return void
 		 * @access protected
 		 */
 		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),
 				'PasswordHashingMethod' => PasswordHashingMethod::PHPPASS,
 			);
 
 			$this->Conn->doUpdate($fields_hash, TABLE_PREFIX . 'Users', 'PortalUserId = ' . $user_id);
 		}
 
 		/**
 		 * Process all required data and redirect logged-in user
 		 *
 		 * @param string $username
 		 * @param string $password
 		 * @return void
 		 */
 		protected function _processLoginRedirect($username = null, $password = null)
 		{
 			// set next template
 			$next_template = $this->Application->GetVar('next_template');
 
 			if ( $next_template ) {
 				$this->event->redirect = $next_template;
 			}
 
 			// process IIS redirect
 			if ( $this->Application->ConfigValue('UseJSRedirect') ) {
 				$this->event->SetRedirectParam('js_redirect', 1);
 			}
 
 			// 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);
 			}
 			else {
 				$sync_manager->performAction('LogoutUser');
 			}
 		}
 
 		/**
 		 * Sets correct interface language after successful login, based on user settings
 		 *
 		 * @return void
 		 * @access protected
 		 */
 		protected function _processInterfaceLanguage()
 		{
 			if ( defined('IS_INSTALL') && IS_INSTALL ) {
 				$this->event->SetRedirectParam('m_lang', 1); // data
 				$this->Application->Session->SetField('Language', 1); // interface
 
 				return;
 			}
 
 			$language_field = $this->Application->isAdmin ? 'AdminLanguage' : 'FrontLanguage';
 			$primary_language_field = $this->Application->isAdmin ? 'AdminInterfaceLang' : 'PrimaryLang';
 			$is_root = $this->Application->RecallVar('user_id') == USER_ROOT;
 
 			$object =& $this->getUserObject();
 
 			$user_language_id = $is_root ? $this->Application->RecallPersistentVar($language_field) : $object->GetDBField($language_field);
 
 			$sql = 'SELECT LanguageId, IF(LanguageId = ' . (int)$user_language_id . ', 2, ' . $primary_language_field . ') AS SortKey
 					FROM ' . TABLE_PREFIX . 'Languages
 					WHERE Enabled = 1
 					HAVING SortKey <> 0
 					ORDER BY SortKey DESC';
 			$language_info = $this->Conn->GetRow($sql);
 			$language_id = $language_info && $language_info['LanguageId'] ? $language_info['LanguageId'] : $user_language_id;
 
 			if ( $user_language_id != $language_id ) {
 				// first login OR language was deleted or disabled
 				if ( $is_root ) {
 					$this->Application->StorePersistentVar($language_field, $language_id);
 				}
 				else {
 					$object->SetDBField($language_field, $language_id);
 					$object->Update();
 				}
 			}
 
 			// set language for Admin Console & Front-End with disabled Mod-Rewrite
 			$this->event->SetRedirectParam('m_lang', $language_id); // data
 			$this->Application->Session->SetField('Language', $language_id); // interface
 		}
 
 		/**
 		 * Injects redirect params into next template, which doesn't happen if next template starts with "external:"
 		 *
 		 * @return void
 		 * @access protected
 		 */
 		protected function _fixNextTemplate()
 		{
 			if ( !MOD_REWRITE || !is_object($this->event) ) {
 				return;
 			}
 
 			// solve problem, when template is "true" instead of actual template name
 			$template = is_string($this->event->redirect) ? $this->event->redirect : '';
 			$url = $this->Application->HREF($template, '', $this->event->getRedirectParams(), $this->event->redirectScript);
 			$vars = $this->Application->parseRewriteUrl($url, 'pass');
 			unset($vars['login'], $vars['logout']);
 
 			// merge back url params, because they were ignored if this was "external:" url
 			$vars = array_merge($vars, $this->getRedirectParams($vars['pass'], 'pass'));
 
 			if ( $template != 'index' ) {
 				// The 'index.html' becomes '', which in turn leads to current page instead of 'index.html'.
 				$template = $vars['t'];
 			}
 
 			unset($vars['is_virtual'], $vars['t']);
 
 			$this->event->redirect = $template;
 			$this->event->setRedirectParams($vars, false);
 		}
 
 		/**
 		 * Returns current event redirect params with given $prefixes injected into 'pass'.
 		 *
 		 * @param array  $prefixes   List of prefixes to inject.
 		 * @param string $pass_name Name of array key in redirect params, containing comma-separated prefixes list.
 		 *
 		 * @return string
 		 * @access protected
 		 */
 		protected function getRedirectParams($prefixes, $pass_name = 'passed')
 		{
 			$redirect_params = $this->event->getRedirectParams();
 
 			if ( isset($redirect_params[$pass_name]) ) {
 				$redirect_prefixes = explode(',', $redirect_params[$pass_name]);
 				$prefixes = array_unique(array_merge($prefixes, $redirect_prefixes));
 			}
 
 			$redirect_params[$pass_name] = implode(',', $prefixes);
 
 			return $redirect_params;
 		}
 
 		/**
 		 * Checks that user is allowed to use super admin mode
 		 *
 		 * @return bool
 		 */
 		function verifySuperAdmin()
 		{
 			$sa_mode = kUtil::ipMatch(defined('SA_IP') ? SA_IP : '');
 			return $sa_mode || $this->Application->isDebugMode();
 		}
 
 		/**
 		 * Returns user object, used during login processing
 		 *
 		 * @return UsersItem
 		 * @access public
 		 */
 		public function &getUserObject()
 		{
 			$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;
 		}
 
 		/**
 		 * Checks, if given user fields matches at least one of defined ban rules
 		 *
 		 * @param kDBItem $object
 		 * @return bool
 		 */
 		function checkBanRules(&$object)
 		{
 			$table = $this->Application->getUnitConfig('ban-rule')->getTableName();
 
 			if (!$this->Conn->TableFound($table)) {
 				// when ban table not found -> assume user is ok by default
 				return true;
 			}
 
 			$sql = 'SELECT *
 					FROM ' . $table . '
 					WHERE ItemType = 6 AND Status = ' . STATUS_ACTIVE . '
 					ORDER BY Priority DESC';
 			$rules = $this->Conn->Query($sql);
 
 			$found = false;
 
 			foreach ($rules as $rule) {
 				$field = $rule['ItemField'];
 				$this_value = mb_strtolower( $object->GetDBField($field) );
 				$test_value = mb_strtolower( $rule['ItemValue'] );
 
 				switch ( $rule['ItemVerb'] ) {
 					case 1: // is
 						if ($this_value == $test_value) {
 							$found = true;
 						}
 						break;
 
 					case 2: // is not
 						if ($this_value != $test_value) {
 							$found = true;
 						}
 						break;
 
 					case 3: // contains
 						if ( strstr($this_value, $test_value) ) {
 							$found = true;
 						}
 						break;
 
 					case 4: // not contains
 						if ( !strstr($this_value, $test_value) ) {
 							$found = true;
 						}
 						break;
 
 					case 7: // exists
 						if ( strlen($this_value) > 0 ) {
 							$found = true;
 						}
 						break;
 
 					case 8: // unique
 						if ( $this->_checkValueExist($field, $this_value) ) {
 							$found = true;
 						}
 						break;
 				}
 
 				if ( $found ) {
 					// check ban rules, until one of them matches
 
 					if ( $rule['RuleType'] ) {
 						// invert rule type
 						$found = false;
 					}
 
 					break;
 				}
 			}
 
 			return !$found;
 		}
 
 		/**
 		 * Checks if value is unique in Users table against the specified field
 		 *
 		 * @param string $field
 		 * @param string $value
 		 * @return string
 		 */
 		function _checkValueExist($field, $value)
 	    {
 	    	$sql = 'SELECT *
 	    			FROM ' . $this->Application->getUnitConfig('u')->getTableName() . '
 					WHERE '. $field .' = ' . $this->Conn->qstr($value);
 
 			return $this->Conn->GetOne($sql);
 	    }
 
 		public function validateUserCode($user_code, $code_type, $expiration_timeout = null)
 		{
 			$expiration_timeouts = Array (
 				'forgot_password' => 'config:Users_AllowReset',
 				'activation' => 'config:UserEmailActivationTimeout',
 				'verify_email' => 'config:Users_AllowReset',
 				'custom' => '',
 			);
 
 		    if ( !$user_code ) {
 		    	return 'code_is_not_valid';
 		    }
 
 		    $sql = 'SELECT PwRequestTime, PortalUserId
 		    		FROM ' . TABLE_PREFIX . 'Users
 		    		WHERE PwResetConfirm = ' . $this->Conn->qstr( trim($user_code) );
 		    $user_info = $this->Conn->GetRow($sql);
 
 		    if ( $user_info === false ) {
 		    	return 'code_is_not_valid';
 		    }
 
 	    	$expiration_timeout = isset($expiration_timeout) ? $expiration_timeout : $expiration_timeouts[$code_type];
 
 	    	if ( preg_match('/^config:(.*)$/', $expiration_timeout, $regs) ) {
 	    		$expiration_timeout = $this->Application->ConfigValue( $regs[1] );
 	    	}
 
 	    	if ( $expiration_timeout && $user_info['PwRequestTime'] < strtotime('-' . $expiration_timeout . ' minutes') ) {
 				return 'code_expired';
 	    	}
 
 			return $user_info['PortalUserId'];
 		}
 
 		/**
 		 * Restores user's email, returns error label, if error occurred
 		 *
 		 * @param string $hash
 		 * @return string
 		 * @access public
 		 */
 		public function restoreEmail($hash)
 		{
 			if ( !preg_match('/^[a-f0-9]{32}$/', $hash) ) {
 				return 'invalid_hash';
 			}
 
 			$sql = 'SELECT PortalUserId, PrevEmails
 					FROM ' . TABLE_PREFIX . 'Users
 					WHERE PrevEmails LIKE ' . $this->Conn->qstr('%' . $hash . '%');
 			$user_info = $this->Conn->GetRow($sql);
 
 			if ( $user_info === false ) {
 				return 'invalid_hash';
 			}
 
 			$prev_emails = $user_info['PrevEmails'];
 			$prev_emails = $prev_emails ? unserialize($prev_emails) : Array ();
 
 			if ( !isset($prev_emails[$hash]) ) {
 				return 'invalid_hash';
 			}
 
 			$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));
 			$object->SetDBField('Email', $email_to_restore);
 			$object->SetDBField('EmailVerified', 1);
 
 			return $object->Update() ? '' : 'restore_impossible';
 		}
 
 		/**
 		 * Generates random string
 		 *
 		 * @param int $length
 		 * @param bool $special_chars
 		 * @param bool $extra_special_chars
 		 * @return string
 		 * @access public
 		 */
 		public function generateRandomString($length = 12, $special_chars = true, $extra_special_chars = false)
 		{
 			$chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
 
 			if ( $special_chars ) {
 				$chars .= '!@#$%^&*()';
 			}
 
 			if ( $extra_special_chars ) {
 				$chars .= '-_ []{}<>~`+=,.;:/?|';
 			}
 
 			$password = '';
 
 			for ($i = 0; $i < $length; $i++) {
 				$password .= substr($chars, $this->_generateRandomNumber(0, strlen($chars) - 1), 1);
 			}
 
 			return $password;
 		}
 
 		/**
 		 * Generates a random number
 		 *
 		 * @param int $min Lower limit for the generated number (optional, default is 0)
 		 * @param int $max Upper limit for the generated number (optional, default is 4294967295)
 		 * @return int A random number between min and max
 		 * @access protected
 		 */
 		protected function _generateRandomNumber($min = 0, $max = 0)
 		{
 			static $rnd_value = '';
 
 			// Reset $rnd_value after 14 uses
 			// 32(md5) + 40(sha1) + 40(sha1) / 8 = 14 random numbers from $rnd_value
 			if ( strlen($rnd_value) < 8 ) {
 				$random_seed = $this->Application->getDBCache('random_seed');
 				$rnd_value = md5(uniqid(microtime() . mt_rand(), true) . $random_seed);
 				$rnd_value .= sha1($rnd_value);
 				$rnd_value .= sha1($rnd_value . $random_seed);
 				$random_seed = md5($random_seed . $rnd_value);
 				$this->Application->setDBCache('random_seed', $random_seed);
 			}
 
 			// Take the first 8 digits for our value
 			$value = substr($rnd_value, 0, 8);
 
 			// Strip the first eight, leaving the remainder for the next call to wp_rand().
 			$rnd_value = substr($rnd_value, 8);
 
 			$value = abs(hexdec($value));
 
 			// Reduce the value to be within the min - max range
 			// 4294967295 = 0xffffffff = max random number
 			if ( $max != 0 ) {
 				$value = $min + (($max - $min + 1) * ($value / (4294967295 + 1)));
 			}
 
 			return abs(intval($value));
 		}
 	}
\ No newline at end of file
Index: branches/5.3.x/core/units/helpers/controls/minput_helper.php
===================================================================
--- branches/5.3.x/core/units/helpers/controls/minput_helper.php	(revision 16518)
+++ branches/5.3.x/core/units/helpers/controls/minput_helper.php	(revision 16519)
@@ -1,218 +1,218 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class MInputHelper extends kHelper {
 
 		/**
 		 * Returns table for given prefix
 		 *
 		 * @param string $prefix
 		 * @param bool $temp
 		 * @return string
 		 * @access protected
 		 */
 		protected function getTable($prefix, $temp = false)
 		{
 			$table_name = $this->Application->getUnitConfig($prefix)->getTableName();
 
 			return $temp ? $this->Application->GetTempName($table_name, 'prefix:' . $prefix) : $table_name;
 		}
 
 		function prepareMInputXML($records, $use_fields)
 		{
 			$xml = '';
 			foreach ($records as $record) {
 				$xml .= '<record>';
 				foreach ($record as $field_name => $field_value) {
 					if (!in_array($field_name, $use_fields)) {
 						continue;
 					}
 					$xml .= '<field name="' . kUtil::escape($field_name, kUtil::ESCAPE_HTML) . '">' . kUtil::escape($field_value, kUtil::ESCAPE_HTML) . '</field>';
 				}
 				$xml .= '</record>';
 			}
 
 			return $xml ? '<records>'.$xml.'</records>' : '';
 		}
 
 		/**
 		 * Returns validation errors in XML format
 		 *
 		 * @param kDBItem $object
 		 * @param Array $fields_hash
 		 * @return string
 		 */
 		function prepareErrorsXML(&$object, $fields_hash)
 		{
 			$xml = '';
 			$errors = Array ();
 
 			foreach ($fields_hash as $field_name => $field_value) {
 				if (!$object->ValidateField($field_name)) {
 					$field_options = $object->GetFieldOptions($field_name);
 					$error_field = array_key_exists('error_field', $field_options) ? $field_options['error_field'] : $field_name;
 
 					$errors[$error_field] = '<field name="'.$error_field.'">'.$object->GetErrorMsg($error_field, false).'</field>';
 				}
 			}
 
 			return '<errors>'.implode('', $errors).'</errors>';
 		}
 
 		/**
 		 * Validates MInput control fields
 		 *
 		 * @param kEvent $event
 		 */
 		function OnValidateMInputFields($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
 			if ($items_info) {
 				list ($id, $field_values) = each($items_info);
 
 				foreach ($field_values as $field_name => $field_value) {
 					$object->SetField($field_name, $field_value);
 				}
 
 				$event_mapping = Array (
 					'AddRecord' => 'OnBeforeItemCreate',
 					'SaveRecord' => 'OnBeforeItemUpdate',
 				);
 
 				$request_type = $this->Application->GetVar('request_type');
 
 				if (array_key_exists($request_type, $event_mapping)) {
 					$event->CallSubEvent($event_mapping[$request_type]);
 				}
 
 				echo $this->prepareErrorsXML($object, $field_values);
 			}
 
 			$event->status = kEvent::erSTOP;
 		}
 
 		function parseMInputXML($xml)
 		{
 			$records = Array ();
 			$records_node = simplexml_load_string($xml);
 
 			if ( $records_node === false ) {
 				return false;
 			}
 
 			foreach ($records_node as $record_node) {
 				$record = Array ();
 
 				foreach ($record_node as $field_node) {
 					$record[(string)$field_node['name']] = (string)$field_node;
 				}
 
 				$records[] = $record;
 			}
 
 			return $records;
 		}
 
 		/**
 		 * Loads selected values from sub_prefix to main item virtual field.
 		 * Called from OnAfterItemLoad of main prefix.
 		 *
 		 * @param kEvent $event
 		 * @param string $store_field main item's field name, to store values into
 		 * @param string $sub_prefix prefix used to store info about selected items
 		 * @param Array $use_fields fields, used in value string building
 		 */
 		function LoadValues($event, $store_field, $sub_prefix, $use_fields)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
+			/** @var kDBItem $sub_item */
 			$sub_item = $this->Application->recallObject($sub_prefix, null, Array('skip_autoload' => true));
-			/* @var $sub_item kDBItem */
 
 			$foreign_key = $this->Application->getUnitConfig($sub_prefix)->getForeignKey();
 
 			$sql = 'SELECT *
 					FROM '.$this->getTable($sub_prefix, $object->IsTempTable()).'
 					WHERE '.$foreign_key.' = '.$object->GetID();
 
 			$selected_items = $this->Conn->Query($sql);
 
 			$field_names = array_keys( $sub_item->GetFieldValues() );
 
 			foreach ($selected_items as $key => $fields_hash) {
 				$sub_item->Clear();
 				$sub_item->SetDBFieldsFromHash($fields_hash);
 
 				// to fill *_date and *_time fields from main date fields
 				$sub_item->UpdateFormattersSubFields();
 
 				foreach ($field_names as $field) {
 					$field_options = $sub_item->GetFieldOptions($field);
 					$formatter = array_key_exists('formatter', $field_options) ? $field_options['formatter'] : false;
 
 					if ($formatter == 'kDateFormatter') {
 						$selected_items[$key][$field] = $sub_item->GetField($field, $field_options['input_format']);
 					}
 					else {
 						$selected_items[$key][$field] = $sub_item->GetDBField($field);
 					}
 				}
 			}
 
 			$object->SetDBField($store_field, $this->prepareMInputXML($selected_items, $use_fields));
 		}
 
 		/**
 		 * Saves data from minput control to subitem table (used from subitem hook)
 		 *
 		 * @param kEvent $sub_event
 		 * @param string $store_field
 		 */
 		function SaveValues(&$sub_event, $store_field)
 		{
+			/** @var kDBItem $main_object */
 			$main_object = $sub_event->MasterEvent->getObject();
-			/* @var $main_object kDBItem */
 
 			$affected_field = $main_object->GetDBField($store_field);
 
+			/** @var kDBItem $object */
 			$object = $this->Application->recallObject($sub_event->getPrefixSpecial(), null, Array ('skip_autoload' => true));
-			/* @var $object kDBItem */
 
 			$sub_table = $object->TableName;
 			$foreign_key = $sub_event->getUnitConfig()->getForeignKey();
 
 			$sql = 'DELETE FROM '.$sub_table.'
 					WHERE '.$foreign_key.' = '.$main_object->GetID();
 
 			$this->Conn->Query($sql);
 
 			if ($affected_field) {
 				$records = $this->parseMInputXML($affected_field);
 				$main_id = $main_object->GetID();
 
 				foreach ($records as $fields_hash) {
 					$object->Clear();
 					$fields_hash[$foreign_key] = $main_id;
 					$object->SetDBFieldsFromHash($fields_hash);
 					$object->Create();
 				}
 			}
 		}
 	}
\ No newline at end of file
Index: branches/5.3.x/core/units/helpers/controls/edit_picker_helper.php
===================================================================
--- branches/5.3.x/core/units/helpers/controls/edit_picker_helper.php	(revision 16518)
+++ branches/5.3.x/core/units/helpers/controls/edit_picker_helper.php	(revision 16519)
@@ -1,186 +1,186 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class EditPickerHelper extends kHelper {
 
 		function getTable($prefix, $temp = false)
 		{
 			$table_name = $this->Application->getUnitConfig($prefix)->getTableName();
 
 			return $temp ? $this->Application->GetTempName($table_name, 'prefix:' . $prefix) : $table_name;
 		}
 
 		/**
 		 * Applies filter for multiple lists in inp_edit_picker control.
 		 * Called from SetCustomQuery of prefix, that contains all available items.
 		 *
 		 * @param kEvent $event
 		 * @param string $storage_field main item's field name, where values are located
 		 */
 		function applyFilter($event, $storage_field)
 		{
 			if ($event->Special != 'selected' && $event->Special != 'available') {
 				return ;
 			}
 
 			if ($storage_field != $event->getEventParam('link_to_field')) {
 				return ;
 			}
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
+			/** @var kDBItem $main_object */
 			$main_object = $this->Application->recallObject($event->getEventParam('link_to_prefix'));
-			/* @var $main_object kDBItem */
 
 			$selected_items = $main_object->GetDBField($storage_field);
 			if ($selected_items) {
 				$filter_type = $event->Special == 'selected' ? 'IN' : 'NOT IN';
 				$selected_items = explode('|', substr($selected_items, 1, -1));
 				$filter_clause = '%1$s.' . $object->IDField.' '.$filter_type.' ('.implode(',', $selected_items).')';
 			}
 			else {
 				$filter_clause = ($event->Special == 'selected') ? 'FALSE' : 'TRUE';
 			}
 
 			$constrain = $this->_getConstrain($main_object, $storage_field, 'filter');
 			if ($constrain) {
 				$filter_clause .= ' AND (' . $constrain . ')';
 			}
 
 			$object->addFilter('edit_picker_filter', $filter_clause);
 		}
 
 		/**
 		 * Loads selected values from sub_prefix to main item virtual field.
 		 * Called from OnAfterItemLoad of main prefix.
 		 *
 		 * @param kEvent $event
 		 * @param string $store_field main item's field name, to store values into
 		 * @param string $source_field prefix and it's field used to store info about selected items (format: prefix.field)
 		 */
 		function LoadValues($event, $store_field, $source_field)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			list ($sub_prefix, $sub_prefix_field) = explode('.', $source_field);
 			$foreign_key = $this->Application->getUnitConfig($sub_prefix)->getForeignKey();
 
 			$sql = 'SELECT '.$sub_prefix_field.'
 					FROM '.$this->getTable($sub_prefix, $object->IsTempTable()).'
 					WHERE '.$foreign_key.' = '.$object->GetID();
 
 			$constrain = $this->_getConstrain($object, $store_field, 'load');
 			if ($constrain) {
 				$sql .= ' AND (' . $sub_prefix_field . ' IN (' . $constrain . '))';
 			}
 
 			$selected_items = array_unique($this->Conn->GetCol($sql));
 
 			$object->SetDBField($store_field, $selected_items ? '|'.implode('|', $selected_items).'|' : '');
 		}
 
 		/**
 		 * Saves value to sub-item's table
 		 *
 		 * @param kEvent $sub_event
 		 * @param string $store_field main item's field name, to get values from
 		 * @param string $sub_prefix_field check already existing records by this field
 		 */
 		function SaveValues(&$sub_event, $store_field, $sub_prefix_field)
 		{
+			/** @var kDBItem $main_object */
 			$main_object = $sub_event->MasterEvent->getObject();
-			/* @var $main_object kDBItem */
 
 			$affected_field = $main_object->GetDBField($store_field);
 
+			/** @var kDBItem $object */
 			$object = $this->Application->recallObject($sub_event->getPrefixSpecial(), null, Array('skip_autoload' => true));
-			/* @var $object kDBItem */
 
 			$sub_table = $object->TableName;
 			$foreign_key = $sub_event->getUnitConfig()->getForeignKey();
 
 			// 1. get previous values from db
 			$sql = 'SELECT ' . $sub_prefix_field . '
 					FROM ' . $sub_table . '
 					WHERE '.$foreign_key.' = '.$main_object->GetID();
 
 			$constrain = $this->_getConstrain($main_object, $store_field, 'save');
 			if ($constrain) {
 				$sql .= ' AND (' . $sub_prefix_field . ' IN (' . $constrain . '))';
 			}
 
 			$old_values = $this->Conn->GetCol($sql);
 
 			// 2. get new values from form
 			$new_values = $affected_field ? explode('|', substr($affected_field, 1, -1)) : Array ();
 
 			$records_to_add = array_diff($new_values, $old_values);
 			$records_to_delete = array_diff($old_values, $new_values);
 
 			if ($records_to_delete && $main_object->isLoaded()) {
 				$where_clause = Array (
 					$foreign_key . ' = ' . $main_object->GetID(),
 					$sub_prefix_field . ' IN (' . implode(',', $records_to_delete) . ')',
 				);
 				$sql = 'SELECT ' . $object->IDField . '
 						FROM ' . $sub_table . '
 						WHERE (' . implode(') AND (', $where_clause) . ')';
 				$delete_ids = $this->Conn->GetCol($sql);
 
 				foreach ($delete_ids as $delete_id) {
 					$object->Delete($delete_id);
 				}
 			}
 
 			if ($records_to_add) {
 				$main_id = $main_object->GetID();
 				foreach ($records_to_add as $add_id) {
 					$object->Clear();
 					$object->SetDBField($foreign_key, $main_id);
 					$object->SetDBField($sub_prefix_field, $add_id);
 					$object->Create();
 				}
 			}
 		}
 
 		/**
 		 * Returns constrain for picker options query
 		 *
 		 * @param kDBItem $object
 		 * @param string $store_field
 		 * @param string $mode
 		 * @return bool|string
 		 */
 		function _getConstrain(&$object, $store_field, $mode = 'filter')
 		{
 			$field_options = $object->GetFieldOptions($store_field);
 			$constrain = array_key_exists('option_constrain', $field_options) ? $field_options['option_constrain']
 					: false;
 
 			if ( $mode == 'filter' ) {
 				// filter on edit form
 				return $constrain;
 			}
 			elseif ( $constrain ) {
 				// load or save
 				return sprintf($field_options['options_sql'], $field_options['option_key_field']);
 			}
 
 			return false;
 		}
 	}
\ No newline at end of file
Index: branches/5.3.x/core/units/helpers/file_helper.php
===================================================================
--- branches/5.3.x/core/units/helpers/file_helper.php	(revision 16518)
+++ branches/5.3.x/core/units/helpers/file_helper.php	(revision 16519)
@@ -1,481 +1,481 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class FileHelper extends kHelper {
 
 		/**
 		 * Puts existing item images (from sub-item) to virtual fields (in main item)
 		 *
 		 * @param kCatDBItem $object
 		 * @return void
 		 * @access public
 		 */
 		public function LoadItemFiles(&$object)
 		{
 			$max_file_count = $this->Application->ConfigValue($object->Prefix.'_MaxImageCount'); // file count equals to image count (temporary measure)
 
 			$sql = 'SELECT *
 					FROM '.TABLE_PREFIX.'CatalogFiles
 					WHERE ResourceId = '.$object->GetDBField('ResourceId').'
 					ORDER BY FileId ASC
 					LIMIT 0, '.(int)$max_file_count;
 			$item_files = $this->Conn->Query($sql);
 
 			$file_counter = 1;
 			foreach ($item_files as $item_file) {
 				$file_path = $item_file['FilePath'];
 				$object->SetDBField('File'.$file_counter, $file_path);
 				$object->SetOriginalField('File'.$file_counter, $file_path);
 				$object->SetFieldOption('File'.$file_counter, 'original_field', $item_file['FileName']);
 				$file_counter++;
 			}
 		}
 
 		/**
 		 * Saves newly uploaded images to external image table
 		 *
 		 * @param kCatDBItem $object
 		 * @return void
 		 * @access public
 		 */
 		public function SaveItemFiles(&$object)
 		{
 			$table_name = $this->Application->getUnitConfig('#file')->getTableName();
 			$max_file_count = $object->getUnitConfig()->getFileCount();
 //			$max_file_count = $this->Application->ConfigValue($object->Prefix . '_MaxImageCount');
 
 			$this->CheckFolder(FULL_PATH . ITEM_FILES_PATH);
 
 			$i = 0;
 			while ($i < $max_file_count) {
 				$field = 'File'.($i + 1);
 				$field_options = $object->GetFieldOptions($field);
 
 				$file_path = $object->GetDBField($field);
 				if ($file_path) {
 					if (isset($field_options['original_field'])) {
 						$key_clause = 'FileName = '.$this->Conn->qstr($field_options['original_field']).' AND ResourceId = '.$object->GetDBField('ResourceId');
 
 						if ($object->GetDBField('Delete'.$field)) {
 							// if item was cloned, then new filename is in db (not in $image_src)
 							$sql = 'SELECT FilePath
 									FROM '.$table_name.'
 									WHERE '.$key_clause;
 							$file_path = $this->Conn->GetOne($sql);
 							if (@unlink(FULL_PATH.ITEM_FILES_PATH.$file_path)) {
 								$sql = 'DELETE FROM '.$table_name.'
 										WHERE '.$key_clause;
 								$this->Conn->Query($sql);
 							}
 						}
 						else {
 							// image record found -> update
 							$fields_hash = Array (
 								'FilePath' => $file_path,
 							);
 
 							$this->Conn->doUpdate($fields_hash, $table_name, $key_clause);
 						}
 					}
 					else {
 						// record not found -> create
 						$fields_hash = Array (
 							'ResourceId' => $object->GetDBField('ResourceId'),
 							'FileName' => $field,
 							'Status' => STATUS_ACTIVE,
 							'FilePath' => $file_path,
 						);
 
 						$this->Conn->doInsert($fields_hash, $table_name);
 						$field_options['original_field'] = $field;
 						$object->SetFieldOptions($field, $field_options);
 					}
 				}
 				$i++;
 			}
 		}
 
 		/**
 		 * Preserves cloned item images/files to be rewritten with original item images/files
 		 *
 		 * @param Array $field_values
 		 * @return void
 		 * @access public
 		 */
 		public function PreserveItemFiles(&$field_values)
 		{
 			foreach ($field_values as $field_name => $field_value) {
 				if ( !is_array($field_value) ) {
 					continue;
 				}
 
 				if ( isset($field_value['upload']) && ($field_value['error'] == UPLOAD_ERR_NO_FILE) ) {
 					// this is upload field, but nothing was uploaded this time
 					unset($field_values[$field_name]);
 				}
 			}
 		}
 
 		/**
 		 * Determines what image/file fields should be created (from post or just dummy fields for 1st upload)
 		 *
 		 * @param string $prefix
 		 * @param bool $is_image
 		 * @return void
 		 * @access public
 		 */
 		public function createItemFiles($prefix, $is_image = false)
 		{
 			$items_info = $this->Application->GetVar($prefix);
 			if ($items_info) {
 				list (, $fields_values) = each($items_info);
 				$this->createUploadFields($prefix, $fields_values, $is_image);
 			}
 			else {
 				$this->createUploadFields($prefix, Array(), $is_image);
 			}
 		}
 
 		/**
 		 * Dynamically creates virtual fields for item for each image/file field in submit
 		 *
 		 * @param string $prefix
 		 * @param Array $fields_values
 		 * @param bool $is_image
 		 * @return void
 		 * @access public
 		 */
 		public function createUploadFields($prefix, $fields_values, $is_image = false)
 		{
 			$field_options = Array ('type' => 'string', 'max_len' => 240, 'default' => '',);
 
 			if ( $is_image ) {
 				$field_options['formatter'] = 'kPictureFormatter';
 				$field_options['include_path'] = 1;
 				$field_options['allowed_types'] = Array ('image/jpeg', 'image/pjpeg', 'image/png', 'image/x-png', 'image/gif', 'image/bmp');
 				$field_prefix = 'Image';
 			}
 			else {
 				$field_options['formatter'] = 'kUploadFormatter';
 				$field_options['upload_dir'] = ITEM_FILES_PATH;
 				$field_options['allowed_types'] = Array ('application/pdf', 'application/msexcel', 'application/msword', 'application/mspowerpoint');
 				$field_prefix = 'File';
 			}
 
 			$image_count = 0;
 			$config = $this->Application->getUnitConfig($prefix);
 
 			foreach ($fields_values as $field_name => $field_value) {
 				if ( preg_match('/^(' . $field_prefix . '[\d]+|Primary' . $field_prefix . ')$/', $field_name) ) {
 					$config->addFields($field_options, $field_name);
 					$config->addVirtualFields($field_options, $field_name);
 					$this->_createCustomFields($prefix, $field_name, $config, $is_image);
 
 					$image_count++;
 				}
 			}
 
 			if ( !$image_count ) {
 				// no images found in POST -> create default image fields
 				$image_count = $this->Application->ConfigValue($prefix . '_MaxImageCount');
 
 				if ( $is_image ) {
 					$created_count = 1;
 					$image_names = Array ('Primary' . $field_prefix => '');
 
 					while ( $created_count < $image_count ) {
 						$image_names[$field_prefix . $created_count] = '';
 						$created_count++;
 					}
 				}
 				else {
 					$created_count = 0;
 					$image_names = Array ();
 
 					while ( $created_count < $image_count ) {
 						$image_names[$field_prefix . ($created_count + 1)] = '';
 						$created_count++;
 					}
 				}
 
 				if ( $created_count ) {
 					$this->createUploadFields($prefix, $image_names, $is_image);
 				}
 
 				return;
 			}
 
 			$config->setSetting($field_prefix . 'Count', $image_count);
 		}
 
 		/**
 		 * Adds ability to create more virtual fields associated with main image/file
 		 *
 		 * @param string $prefix
 		 * @param string $field_name
 		 * @param kUnitConfig $config
 		 * @param bool $is_image
 		 * @return void
 		 * @access protected
 		 */
 		protected function _createCustomFields($prefix, $field_name, kUnitConfig $config, $is_image = false)
 		{
 			$config->addVirtualFields(Array ('type' => 'int', 'default' => 0), 'Delete' . $field_name);
 
 			if ( $is_image ) {
 				$config->addVirtualFields(Array ('type' => 'string', 'default' => ''), $field_name . 'Alt');
 			}
 		}
 
 		/**
 		 * Downloads file to user
 		 *
 		 * @param string $filename
 		 * @return void
 		 * @access public
 		 */
 		public function DownloadFile($filename)
 		{
 			$this->Application->setContentType(kUtil::mimeContentType($filename), false);
 			header('Content-Disposition: attachment; filename="' . basename($filename) . '"');
 			header('Content-Length: ' . filesize($filename));
 			readfile($filename);
 			flush();
 		}
 
 		/**
 		 * Creates folder with given $path
 		 *
 		 * @param string $path
 		 * @return bool
 		 * @access public
 		 */
 		public function CheckFolder($path)
 		{
 			$result = true;
 
 			if (!file_exists($path) || !is_dir($path)) {
 				$parent_path = preg_replace('#(/|\\\)[^/\\\]+(/|\\\)?$#', '', rtrim($path , '/\\'));
 				$result = $this->CheckFolder($parent_path);
 
 				if ($result) {
 					$result = mkdir($path);
 
 					if ($result) {
 						chmod($path, 0777);
 
 						// don't commit any files from created folder
 						if (file_exists(FULL_PATH . '/CVS')) {
 							$cvsignore = fopen($path . '/.cvsignore', 'w');
 							fwrite($cvsignore, '*.*');
 							fclose($cvsignore);
 							chmod($path . '/.cvsignore', 0777);
 						}
 					}
 					else {
 						trigger_error('Cannot create directory "<strong>' . $path . '</strong>"', E_USER_WARNING);
 						return false;
 					}
 				}
 			}
 
 			return $result;
 		}
 
 		/**
 		 * Copies all files and directories from $source to $destination directory. Create destination directory, when missing.
 		 *
 		 * @param string $source
 		 * @param string $destination
 		 * @return bool
 		 * @access public
 		 */
 		public function copyFolderRecursive($source, $destination)
 		{
 			if ( substr($source, -1) == DIRECTORY_SEPARATOR ) {
 				$source = substr($source, 0, -1);
 				$destination .= DIRECTORY_SEPARATOR . basename($source);
 			}
 
 			$iterator = new DirectoryIterator($source);
-			/* @var $file_info DirectoryIterator */
+			/** @var DirectoryIterator $file_info */
 
 			$result = $this->CheckFolder($destination);
 
 			foreach ($iterator as $file_info) {
 				if ( $file_info->isDot() ) {
 					continue;
 				}
 
 				$file = $file_info->getFilename();
 
 				if ( $file_info->isDir() ) {
 					$result = $this->copyFolderRecursive($file_info->getPathname(), $destination . DIRECTORY_SEPARATOR . $file);
 				}
 				else {
 					$result = copy($file_info->getPathname(), $destination . DIRECTORY_SEPARATOR . $file);
 				}
 
 				if (!$result) {
 					trigger_error('Cannot create file/directory "<strong>' . $destination . DIRECTORY_SEPARATOR . $file . '</strong>"', E_USER_WARNING);
 					break;
 				}
 			}
 
 			return $result;
 		}
 
 		/**
 		 * Copies all files from $source to $destination directory. Create destination directory, when missing.
 		 *
 		 * @param string $source
 		 * @param string $destination
 		 * @return bool
 		 * @access public
 		 */
 		public function copyFolder($source, $destination)
 		{
 			if ( substr($source, -1) == DIRECTORY_SEPARATOR ) {
 				$source = substr($source, 0, -1);
 				$destination .= DIRECTORY_SEPARATOR . basename($source);
 			}
 
 			$iterator = new DirectoryIterator($source);
-			/* @var $file_info DirectoryIterator */
+			/** @var DirectoryIterator $file_info */
 
 			$result = $this->CheckFolder($destination);
 
 			foreach ($iterator as $file_info) {
 				if ( $file_info->isDot() || !$file_info->isFile() ) {
 					continue;
 				}
 
 				$file = $file_info->getFilename();
 
 				$result = copy($file_info->getPathname(), $destination . DIRECTORY_SEPARATOR . $file);
 
 				if ( !$result ) {
 					trigger_error('Cannot create file "<strong>' . $destination . DIRECTORY_SEPARATOR . $file . '</strong>"', E_USER_WARNING);
 					break;
 				}
 			}
 
 			return $result;
 		}
 
 		/**
 		 * Transforms given path to file into it's url, where each each component is encoded (excluding domain and protocol)
 		 *
 		 * @param string      $path   Path to file.
 		 * @param string|null $domain Alternative domain to use in url.
 		 *
 		 * @return string
 		 * @access public
 		 */
 		public function pathToUrl($path, $domain = null)
 		{
 			$path = str_replace(DIRECTORY_SEPARATOR, '/', preg_replace('/^' . preg_quote(FULL_PATH, '/') . '(.*)/', '\\1', $path, 1));
 
 			// TODO: why?
 			$path = implode('/', array_map('rawurlencode', explode('/', $path)));
 
 			return rtrim($this->Application->BaseURL($domain), '/') . $path;
 		}
 
 		/**
 		 * Transforms given url to path to it
 		 *
 		 * @param string      $url    Url.
 		 * @param string|null $domain Alternative domain to use in url.
 		 *
 		 * @return string
 		 */
 		public function urlToPath($url, $domain = null)
 		{
 			$base_url = rtrim($this->Application->BaseURL($domain), '/');
 
 			// escape replacement patterns, like "\<number>"
 			$full_path = preg_replace('/(\\\[\d]+)/', '\\\\\1', FULL_PATH);
 			$path = preg_replace('/^' . preg_quote($base_url, '/') . '(.*)/', $full_path . '\\1', $url, 1);
 
 			return str_replace('/', DIRECTORY_SEPARATOR, kUtil::unescape($path, kUtil::ESCAPE_URL));
 		}
 
 		/**
 		 * Makes given paths DocumentRoot agnostic.
 		 *
 		 * @param array $paths List of file paths.
 		 *
 		 * @return array
 		 */
 		public function makeRelative(array $paths)
 		{
 			foreach ( $paths as $index => $path ) {
 				$replaced_count = 0;
 				$relative_path = preg_replace('/^' . preg_quote(FULL_PATH, '/') . '/', '', $path, 1, $replaced_count);
 
 				if ( $replaced_count === 1 ) {
 					$paths[$index] = $relative_path;
 				}
 			}
 
 			return $paths;
 		}
 
 		/**
 		 * Ensures, that new file will not overwrite any of previously created files with same name
 		 *
 		 * @param string $path
 		 * @param string $name
 		 * @param Array $forbidden_names
 		 * @return string
 		 */
 		public function ensureUniqueFilename($path, $name, $forbidden_names = Array ())
 		{
 			$parts = pathinfo($name);
 			$ext = '.' . $parts['extension'];
 			$filename = $parts['filename'];
 			$path = rtrim($path, '/');
 
 			$original_checked = false;
 			$new_name = $filename . $ext;
 
 			if ( $parts['dirname'] != '.' ) {
 				$path .= '/' . ltrim($parts['dirname'], '/');
 			}
 
 			// make sure target folder always exists, especially for cases,
 			// when storage engine folder is supplied as a part of $name
 			$this->CheckFolder($path);
 
 			while (file_exists($path . '/' . $new_name) || in_array($path . '/' . $new_name, $forbidden_names)) {
 				if ( preg_match('/(.*)_([0-9]*)(' . preg_quote($ext, '/') . ')/', $new_name, $regs) ) {
 					$new_name = $regs[1] . '_' . ((int)$regs[2] + 1) . $regs[3];
 				}
 				elseif ( $original_checked ) {
 					$new_name = $filename . '_1' . $ext;
 				}
 
 				$original_checked = true;
 			}
 
 			if ( $parts['dirname'] != '.' ) {
 				$new_name = $parts['dirname'] . '/' . $new_name;
 			}
 
 			return $new_name;
 		}
 	}
Index: branches/5.3.x/core/units/helpers/deployment_helper.php
===================================================================
--- branches/5.3.x/core/units/helpers/deployment_helper.php	(revision 16518)
+++ branches/5.3.x/core/units/helpers/deployment_helper.php	(revision 16519)
@@ -1,764 +1,764 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class DeploymentHelper extends kHelper {
 
 	/**
 	 * How many symbols from sql should be shown.
 	 */
 	const SQL_TRIM_LENGTH = 120;
 
 	const STAGE_DB_MIGRATE = 'db-migrate';
 
 	const STAGE_CACHE_RESET = 'cache-reset';
 
 	/**
 	 * Name of module, that is processed right now.
 	 *
 	 * @var string
 	 */
 	private $moduleName = '';
 
 	/**
 	 * List of sqls, associated with each revision (from project_upgrades.sql file).
 	 *
 	 * @var array
 	 */
 	private $revisionSqls = array();
 
 	/**
 	 * List of revision titles as user typed them (from project_upgrades.sql file).
 	 *
 	 * @var array
 	 */
 	private $revisionTitles = array();
 
 	/**
 	 * Revision dependencies.
 	 *
 	 * @var array
 	 */
 	private $revisionDependencies = array();
 
 	/**
 	 * Numbers of revisions, that were already applied.
 	 *
 	 * @var array
 	 */
 	private $appliedRevisions = array();
 
 	/**
 	 * Don't change database, but only check syntax of project_upgrades.sql file and mark all revisions discovered as applied.
 	 *
 	 * @var boolean
 	 */
 	private $dryRun = false;
 
 	/**
 	 * Remembers script invocation method.
 	 *
 	 * @var boolean
 	 */
 	public $isCommandLine = false;
 
 	/**
 	 * IP Address of script invoker.
 	 *
 	 * @var string
 	 */
 	public $ip = '';
 
 	/**
 	 * Deployment stages to run.
 	 *
 	 * @var array
 	 */
 	public $stages = array(
 		self::STAGE_DB_MIGRATE,
 		self::STAGE_CACHE_RESET,
 	);
 
 	/**
 	 * Event, that triggered deployment.
 	 *
 	 * @var kEvent
 	 */
 	private $_event;
 
 	/**
 	 * Field values for log record.
 	 *
 	 * @var string
 	 */
 	private $logData = array();
 
 	/**
 	 * Creates class instance.
 	 */
 	public function __construct()
 	{
 		parent::__construct();
 
 		kUtil::setResourceLimit();
 
 		$this->_event = new kEvent('adm:OnDummy');
 		$this->isCommandLine = isset($GLOBALS['argv']) && count($GLOBALS['argv']);
 
 		if ( !$this->isCommandLine ) {
 			$this->ip = $this->Application->getClientIp();
 		}
 		else {
 			if ( isset($GLOBALS['argv'][3]) ) {
 				$this->ip = $GLOBALS['argv'][3];
 			}
 
 			if ( isset($GLOBALS['argv'][4]) ) {
 				$new_stages = explode(',', $GLOBALS['argv'][4]);
 				$unknown_stages = array_diff($new_stages, $this->stages);
 
 				if ( $unknown_stages ) {
 					throw new InvalidArgumentException('Unknown deployment stages: ' . implode(', ', $unknown_stages));
 				}
 
 				$this->stages = $new_stages;
 			}
 		}
 	}
 
 	/**
 	 * Sets event, associated with deployment.
 	 *
 	 * @param kEvent $event Event.
 	 *
 	 * @return void
 	 */
 	public function setEvent(kEvent $event)
 	{
 		$this->_event = $event;
 	}
 
 	/**
 	 * Adds message to script execution log.
 	 *
 	 * @param string  $message  Message.
 	 * @param boolean $new_line Jump to next line.
 	 *
 	 * @return string
 	 */
 	private function toLog($message, $new_line = true)
 	{
 		if ( $new_line ) {
 			$message .= PHP_EOL;
 		}
 
 		$this->logData['Output'] .= $message;
 
 		return $message;
 	}
 
 	/**
 	 * Loads already applied revisions list of current module.
 	 *
 	 * @return self
 	 */
 	private function loadAppliedRevisions()
 	{
 		$sql = 'SELECT RevisionNumber
 				FROM ' . TABLE_PREFIX . 'ModuleDeploymentLog
 				WHERE Module = ' . $this->Conn->qstr($this->moduleName);
 		$this->appliedRevisions = array_flip($this->Conn->GetCol($sql));
 
 		return $this;
 	}
 
 	/**
 	 * Deploys changes from all installed modules.
 	 *
 	 * @param boolean $dry_run Use dry run mode?
 	 *
 	 * @return boolean
 	 */
 	public function deployAll($dry_run = false)
 	{
 		if ( !$this->isCommandLine ) {
 			echo '<pre style="font-size: 10pt; color: #BBB; background-color: black; border: 2px solid darkgreen; padding: 8px;">' . PHP_EOL;
 		}
 
 		$ret = true;
 		$this->dryRun = $dry_run;
 
 		if ( in_array(self::STAGE_DB_MIGRATE, $this->stages) ) {
 			foreach ( $this->Application->ModuleInfo as $module_name => $module_info ) {
 				$this->moduleName = $module_name;
 
 				if ( !file_exists($this->getModuleFile('project_upgrades.sql')) ) {
 					continue;
 				}
 
 				$ret = $ret && $this->deploy($module_name);
 			}
 		}
 
 		if ( in_array(self::STAGE_CACHE_RESET, $this->stages) ) {
 			if ( $ret && !$this->dryRun ) {
 				$this->resetCaches();
 				$this->refreshThemes();
 			}
 		}
 
 		if ( !$this->isCommandLine ) {
 			echo kUtil::escape($this->_runShellScript());
 			echo '</pre>' . PHP_EOL;
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Runs user-specific shell script when deployment happens from Web.
 	 *
 	 * @return string
 	 */
 	protected function _runShellScript()
 	{
 		if ( !$this->Application->isDebugMode(false) ) {
 			return '';
 		}
 
 		$wrapper_script = '/usr/local/bin/guest2host_server.sh';
 		$script_name = FULL_PATH . '/tools/' . ($this->dryRun ? 'synchronize.sh' : 'deploy.sh');
 
 		if ( file_exists($wrapper_script) && file_exists($script_name) ) {
 			$script_name = preg_replace('/^.*\/web/', constant('DBG_LOCAL_BASE_PATH'), $script_name);
 
 			return shell_exec($wrapper_script . ' ' . $script_name . ' 2>&1');
 		}
 
 		return '';
 	}
 
 	/**
 	 * Deploys pending changes to a site.
 	 *
 	 * @param string $module_name Module name.
 	 *
 	 * @return boolean
 	 */
 	private function deploy($module_name)
 	{
 		echo $this->colorText('Deploying Module "' . $module_name . '":', 'cyan', true) . PHP_EOL;
 
 		if ( !$this->upgradeDatabase() ) {
 			return false;
 		}
 
 		try {
 			if ( $this->dryRun ) {
 				$this->exportLanguagePack();
 			}
 			else {
 				$this->importLanguagePack();
 			}
 		}
 		catch ( Exception $e ) {
 			echo $this->colorText('Failed with Module "' . $module_name . '".', 'red', true) . PHP_EOL . PHP_EOL;
 
 			return false;
 		}
 
 		echo $this->colorText('Done with Module "' . $module_name . '".', 'green', true) . PHP_EOL . PHP_EOL;
 
 		return true;
 	}
 
 	/**
 	 * Import latest language pack (without overwrite).
 	 *
 	 * @return self
 	 */
 	private function importLanguagePack()
 	{
+		/** @var LanguageImportHelper $language_import_helper */
 		$language_import_helper = $this->Application->recallObject('LanguageImportHelper');
-		/* @var $language_import_helper LanguageImportHelper */
 
 		$this->out('Importing LanguagePack ... ');
 		$filename = $this->getModuleFile('english.lang');
 		$language_import_helper->performImport($filename, '|0|1|2|', $this->moduleName);
 		$this->displayStatus('OK');
 
 		return $this;
 	}
 
 	/**
 	 * Exports latest language pack.
 	 *
 	 * @return self
 	 */
 	private function exportLanguagePack()
 	{
 		static $languages = null;
 
 		if ( !isset($languages) ) {
 			$sql = 'SELECT LanguageId
 					FROM ' . $this->Application->getUnitConfig('lang')->getTableName() . '
 					WHERE Enabled = 1';
 			$languages = $this->Conn->GetCol($sql);
 		}
 
+		/** @var LanguageImportHelper $language_import_helper */
 		$language_import_helper = $this->Application->recallObject('LanguageImportHelper');
-		/* @var $language_import_helper LanguageImportHelper */
 
 		$language_import_helper->performExport(EXPORT_PATH . '/' . $this->moduleName . '.lang', '|0|1|2|', $languages, '|' . $this->moduleName . '|');
 
 		return $this;
 	}
 
 	/**
 	 * Resets unit and section cache.
 	 *
 	 * @return self
 	 */
 	private function resetCaches()
 	{
 		// 2. reset unit config cache (so new classes get auto-registered)
 		$this->out('Resetting Configs Files Cache and Parsed System Data ... ');
 		$this->_event->CallSubEvent('OnResetConfigsCache');
 		$this->displayStatus('OK');
 
 		// 3. reset sections cache
 		$this->out('Resetting Admin Console Sections ... ');
 		$this->_event->CallSubEvent('OnResetSections');
 		$this->displayStatus('OK');
 
 		// 4. reset mod-rewrite cache
 		$this->out('Resetting ModRewrite Cache ... ');
 		$this->_event->CallSubEvent('OnResetModRwCache');
 		$this->displayStatus('OK');
 
 		return $this;
 	}
 
 	/**
 	 * Rebuild theme files.
 	 *
 	 * @return self
 	 */
 	private function refreshThemes()
 	{
 		$this->out('Refreshing Theme Files ... ');
 		$this->_event->CallSubEvent('OnRebuildThemes');
 		$this->displayStatus('OK');
 
 		return $this;
 	}
 
 	/**
 	 * Runs database upgrade script.
 	 *
 	 * @return boolean
 	 */
 	private function upgradeDatabase()
 	{
 		$this->loadAppliedRevisions();
 		$this->Conn->setErrorHandler(array(&$this, 'handleSqlError'));
 
 		$this->out('Verifying Database Revisions ... ');
 
 		if ( !$this->collectDatabaseRevisions() || !$this->checkRevisionDependencies() ) {
 			return false;
 		}
 
 		$this->displayStatus('OK');
 
 		return $this->applyRevisions();
 	}
 
 	/**
 	 * Collects database revisions from "project_upgrades.sql" file.
 	 *
 	 * @return boolean
 	 */
 	private function collectDatabaseRevisions()
 	{
 		$filename = $this->getModuleFile('project_upgrades.sql');
 
 		if ( !file_exists($filename) ) {
 			return true;
 		}
 
 		$sqls = file_get_contents($filename);
 		preg_match_all("/# r([\d]+)([^\:]*):(.*?)(\n|$)/s", $sqls, $matches, PREG_SET_ORDER + PREG_OFFSET_CAPTURE);
 
 		if ( !$matches ) {
 			$this->displayStatus('FAILED' . PHP_EOL . 'No Database Revisions Found');
 
 			return false;
 		}
 
 		$revision_numbers = array();
 
 		foreach ( $matches as $index => $match ) {
 			$revision = $match[1][0];
 
 			if ( in_array($revision, $revision_numbers) ) {
 				$this->displayStatus('FAILED' . PHP_EOL . 'Duplicate revision #' . $revision . ' found');
 
 				return false;
 			}
 
 			$revision_numbers[] = $revision;
 
 			if ( $this->revisionApplied($revision) ) {
 				// Skip applied revisions.
 				continue;
 			}
 
 			// Get revision sqls.
 			$start_pos = $match[0][1] + strlen($match[0][0]);
 			$end_pos = isset($matches[$index + 1]) ? $matches[$index + 1][0][1] : strlen($sqls);
 			$revision_sqls = substr($sqls, $start_pos, $end_pos - $start_pos);
 
 			if ( !$revision_sqls ) {
 				// revision without sqls
 				continue;
 			}
 
 			$this->revisionTitles[$revision] = trim($match[3][0]);
 			$this->revisionSqls[$revision] = $revision_sqls;
 			$revision_dependencies = $this->parseRevisionDependencies($match[2][0]);
 
 			if ( $revision_dependencies ) {
 				$this->revisionDependencies[$revision] = $revision_dependencies;
 			}
 		}
 
 		ksort($this->revisionSqls);
 		ksort($this->revisionDependencies);
 
 		return true;
 	}
 
 	/**
 	 * Checks that all dependent revisions are either present now OR were applied before.
 	 *
 	 * @return boolean
 	 */
 	private function checkRevisionDependencies()
 	{
 		foreach ( $this->revisionDependencies as $revision => $revision_dependencies ) {
 			foreach ( $revision_dependencies as $revision_dependency ) {
 				if ( $this->revisionApplied($revision_dependency) ) {
 					// revision dependent upon already applied -> dependency fulfilled
 					continue;
 				}
 
 				if ( $revision_dependency >= $revision ) {
 					$this->displayStatus('FAILED' . PHP_EOL . 'Revision #' . $revision . ' has incorrect dependency to revision #' . $revision_dependency . '. Only dependencies to older revisions are allowed!');
 
 					return false;
 				}
 
 				if ( !isset($this->revisionSqls[$revision_dependency]) ) {
 					$this->displayStatus('FAILED' . PHP_EOL . 'Revision #' . $revision . ' depends on missing revision #' . $revision_dependency . '!');
 
 					return false;
 				}
 			}
 		}
 
 		return true;
 	}
 
 	/**
 	 * Runs all pending sqls.
 	 *
 	 * @return boolean
 	 */
 	private function applyRevisions()
 	{
 		if ( !$this->revisionSqls ) {
 			return true;
 		}
 
 		if ( $this->dryRun ) {
 			foreach ( $this->revisionSqls as $revision => $sqls ) {
 				$this->initLog($revision, ModuleDeploymentLog::MODE_MANUAL);
 
 				echo PHP_EOL . $this->colorText($this->revisionTitles[$revision], 'gray', true) . PHP_EOL; // 'Processing DB Revision: #' . $revision . ' ... ';
 				echo $this->toLog($this->colorText('SKIPPING', 'purple'));
 
 				$this->saveLog(ModuleDeploymentLog::STATUS_SKIPPED);
 			}
 
 			return true;
 		}
 
 		$this->out('Upgrading Database ... ', true);
 
 		foreach ( $this->revisionSqls as $revision => $sqls ) {
 			echo PHP_EOL . $this->colorText($this->revisionTitles[$revision], 'gray', true) . PHP_EOL; // 'Processing DB Revision: #' . $revision . ' ... ';
 
 			$sqls = str_replace("\r\n", "\n", $sqls); // convert to linux line endings
 			$no_comment_sqls = preg_replace("/#\s([^;]*?)\n/is", "# \\1;\n", $sqls); // add ";" to each comment end to ensure correct split
 
 			$sqls = explode(";\n", $no_comment_sqls . "\n"); // ensures that last sql won't have ";" in it
 			$sqls = array_map('trim', $sqls);
 
 			$this->initLog($revision);
 
 			try {
 				foreach ( $sqls as $sql ) {
 					if ( substr($sql, 0, 1) == '#' ) {
 						// output comment as is
 						echo $this->toLog($this->colorText($sql, 'purple'));
 
 						continue;
 					}
 					elseif ( $sql ) {
 						echo $this->toLog($this->shortenQuery($sql), false);
 						$this->Conn->Query($sql);
 
 						$this->displayStatus('OK (' . $this->Conn->getAffectedRows() . ')', true, true);
 					}
 				}
 			}
 			catch ( Exception $e ) {
 				// consider revisions with errors applied
 				$this->saveLog(ModuleDeploymentLog::STATUS_ERROR);
 
 				return false;
 			}
 
 			$this->saveLog(ModuleDeploymentLog::STATUS_SUCCESS);
 		}
 
 		echo PHP_EOL;
 
 		return true;
 	}
 
 	/**
 	 * Returns shortened version of SQL query.
 	 *
 	 * @param string $sql SQL query.
 	 *
 	 * @return string
 	 */
 	protected function shortenQuery($sql)
 	{
 		$escaped_sql = $this->isCommandLine ? $sql : kUtil::escape($sql);
 		$single_line_sql = preg_replace('/(\n|\t| )+/is', ' ', $escaped_sql);
 
 		return mb_substr(trim($single_line_sql), 0, self::SQL_TRIM_LENGTH) . ' ... ';
 	}
 
 	/**
 	 * Initializes log record for a revision.
 	 *
 	 * @param integer $revision Revision.
 	 * @param integer $mode     Mode.
 	 *
 	 * @return self
 	 */
 	protected function initLog($revision, $mode = ModuleDeploymentLog::MODE_AUTOMATIC)
 	{
 		$this->logData = array(
 			'Module' => $this->moduleName,
 			'RevisionNumber' => $revision,
 			'RevisionTitle' => $this->revisionTitles[$revision],
 			'IPAddress' => $this->ip,
 			'Output' => '',
 			'Mode' => $mode,
 			'Status' => ModuleDeploymentLog::STATUS_SUCCESS,
 		);
 
 		return $this;
 	}
 
 	/**
 	 * Creates log record.
 	 *
 	 * @param integer $status Status.
 	 *
 	 * @return self
 	 */
 	private function saveLog($status)
 	{
 		$this->logData['Status'] = $status;
 
 		$log = $this->Application->recallObject('module-deployment-log', null, array('skip_autoload' => true));
 		/* @var $log kDBItem  */
 
 		$log->Clear();
 		$log->SetFieldsFromHash($this->logData);
 		$log->Create();
 
 		return $this;
 	}
 
 	/**
 	 * Error handler for sql errors.
 	 *
 	 * @param int    $code Error code.
 	 * @param string $msg  Error message.
 	 * @param string $sql  SQL query, that raised an error.
 	 *
 	 * @return void
 	 * @throws Exception When SQL error happens.
 	 */
 	public function handleSqlError($code, $msg, $sql)
 	{
 		$this->displayStatus('FAILED', true, true);
 
 		$error_msg = 'SQL Error #' . $code . ': ' . $msg;
 		$this->logData['ErrorMessage'] = $error_msg;
 		$this->displayStatus($error_msg);
 
 		$this->out('Please execute rest of SQLs in this Revision by hand and run deployment script again.', true);
 
 		throw new Exception($msg, $code);
 	}
 
 	/**
 	 * Checks if given revision was already applied.
 	 *
 	 * @param int $revision Revision.
 	 *
 	 * @return boolean
 	 */
 	private function revisionApplied($revision)
 	{
 		return isset($this->appliedRevisions[$revision]);
 	}
 
 	/**
 	 * Returns path to given file in current module install folder.
 	 *
 	 * @param string $filename Filename.
 	 *
 	 * @return string
 	 */
 	private function getModuleFile($filename)
 	{
 		$module_folder = $this->Application->findModule('Name', $this->moduleName, 'Path');
 
 		return FULL_PATH . DIRECTORY_SEPARATOR . $module_folder . 'install/' . $filename;
 	}
 
 	/**
 	 * Extracts revisions from string in format "(1,3,5464,23342,3243)".
 	 *
 	 * @param string $string Comma-separated revision list.
 	 *
 	 * @return array
 	 */
 	private function parseRevisionDependencies($string)
 	{
 		if ( !$string ) {
 			return array();
 		}
 
 		$string = explode(',', substr($string, 1, -1));
 
 		return array_map('trim', $string);
 	}
 
 	/**
 	 * Applies requested color and bold attributes to given text string.
 	 *
 	 * @param string  $text  Text.
 	 * @param string  $color Color.
 	 * @param boolean $bold  Bold flag.
 	 *
 	 * @return string
 	 */
 	private function colorText($text, $color, $bold = false)
 	{
 		if ( $this->isCommandLine ) {
 			$color_map = array(
 				'black' => 30, // dark gray (in bold)
 				'blue' => 34, // light blue (in bold)
 				'green' => 32, // light green (in bold)
 				'cyan' => 36, // light cyan (in bold)
 				'red' => 31, // light red (in bold)
 				'purple' => 35, // light purple (in bold)
 				'brown' => 33, // yellow (in bold)
 				'gray' => 37, // white (in bold)
 			);
 
 			return "\033[" . ($bold ? 1 : 0) . ";" . $color_map[$color] . "m" . $text . "\033[0m";
 		}
 
 		$html_color_map = array(
 			'black' => array('normal' => '#000000', 'bold' => '#666666'),
 			'blue' => array('normal' => '#00009C', 'bold' => '#3C3CFF'),
 			'green' => array('normal' => '#009000', 'bold' => '#00FF00'),
 			'cyan' => array('normal' => '#009C9C', 'bold' => '#00FFFF'),
 			'red' => array('normal' => '#9C0000', 'bold' => '#FF0000'),
 			'purple' => array('normal' => '#900090', 'bold' => '#F99CF9'),
 			'brown' => array('normal' => '#C9C909', 'bold' => '#FFFF00'),
 			'gray' => array('normal' => '#909090', 'bold' => '#FFFFFF'),
 		);
 
 		$html_color = $html_color_map[$color][$bold ? 'bold' : 'normal'];
 
 		return '<span style="color: ' . $html_color . '">' . kUtil::escape($text, kUtil::ESCAPE_HTML) . '</span>';
 	}
 
 	/**
 	 * Displays last command execution status.
 	 *
 	 * @param string  $status_text Status text.
 	 * @param boolean $new_line    Jump to next line.
 	 * @param boolean $to_log      Also write to log.
 	 *
 	 * @return self
 	 */
 	private function displayStatus($status_text, $new_line = true, $to_log = false)
 	{
 		$color = substr($status_text, 0, 2) == 'OK' ? 'green' : 'red';
 		$ret = $this->colorText($status_text, $color, false);
 
 		if ( $to_log ) {
 			echo $this->toLog($ret, $new_line);
 		}
 		else {
 			echo $ret . ($new_line ? PHP_EOL : '');
 		}
 
 		return $this;
 	}
 
 	/**
 	 * Outputs a text and escapes it if necessary.
 	 *
 	 * @param string  $text     Text.
 	 * @param boolean $new_line Jump to next line.
 	 *
 	 * @return self
 	 */
 	private function out($text, $new_line = false)
 	{
 		if ( !$this->isCommandLine ) {
 			$text = kUtil::escape($text);
 		}
 
 		echo $text . ($new_line ? PHP_EOL : '');
 
 		return $this;
 	}
 
 }
Index: branches/5.3.x/core/units/helpers/priority_helper.php
===================================================================
--- branches/5.3.x/core/units/helpers/priority_helper.php	(revision 16518)
+++ branches/5.3.x/core/units/helpers/priority_helper.php	(revision 16519)
@@ -1,259 +1,259 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class kPriorityHelper extends kHelper {
 
 		/**
 		 * Prepares options for priority dropdown
 		 *
 		 * @param kEvent $event
 		 * @param bool $is_new for newly created items add new priority to the end
 		 * @param string $constrain constrain for priority selection (if any)
 		 * @param string $joins left joins, used by constrain (if any)
 		 *
 		 */
 		function preparePriorities($event, $is_new = false, $constrain = '', $joins = '')
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$field_options = $object->GetFieldOptions('Priority');
 			$table_name = $event->getUnitConfig()->getTableName();
 
 			$sql = 'SELECT COUNT(*)
 					FROM ' . $table_name . ' item_table
 					' . $joins;
 
 			if ( $constrain ) {
 				$sql .= ' WHERE ' . $this->normalizeConstrain($constrain);
 			}
 
 			if ( !$object->isField('OldPriority') ) {
 				// make sure, then OldPriority field is defined
 				$virtual_fields = $object->getVirtualFields();
 				$virtual_fields['OldPriority'] = Array ('type' => 'int', 'default' => 0);
 				$object->setVirtualFields($virtual_fields);
 			}
 
 			$items_count = $this->Conn->GetOne($sql);
 			$current_priority = $object instanceof kDBList ? 0 : $object->GetDBField('Priority');
 
 			if ( $is_new || $current_priority == -($items_count + 1) || $this->isTempTableOnly($object) ) {
 				$items_count++;
 			}
 
 			if ( $is_new ) {
 				// add new item to the end of list
 				$object->SetDBField('Priority', -$items_count);
 				$object->SetDBField('OldPriority', -$items_count);
 			}
 			else {
 				// storing priority right after load for comparing when updating
 				$object->SetDBField('OldPriority', $current_priority);
 			}
 
 			for ($i = 1; $i <= $items_count; $i++) {
 				$field_options['options'][-$i] = $i;
 			}
 
 			$object->SetFieldOptions('Priority', $field_options);
 		}
 
 		/**
 		 * Determines if an item only exists in temp table.
 		 *
 		 * @param kDBBase $object Object.
 		 *
 		 * @return boolean
 		 */
 		protected function isTempTableOnly(kDBBase $object)
 		{
 			if ( !$object->IsTempTable() || ($object instanceof kDBList) ) {
 				return false;
 			}
 
 			return $object->GetID() <= 0;
 		}
 
 		/**
 		 * Updates priorities for changed items
 		 *
 		 * @param kEvent $event
 		 * @param Array $changes = Array (ID => Array ('constrain' => ..., 'new' => ..., 'old' => ...), ...)
 		 * @param Array $new_ids = Array (temp_id => live_id)
 		 * @param string $constrain
 		 * @param string $joins
 		 * @return Array
 		 */
 		function updatePriorities($event, $changes, $new_ids, $constrain = '', $joins = '')
 		{
 			// TODO: no need pass external $constrain, since the one from $pair is used
 
 			if ( !$changes ) {
 				// no changes to process
 				return Array ();
 			}
 
 			$config = $event->getUnitConfig();
 			$id_field = $config->getIDField();
 			$table_name = $config->getTableName();
 
 			if ( $this->Application->IsTempMode($event->Prefix, $event->Special) ) {
 				$table_name = $this->Application->GetTempName($table_name, 'prefix:' . $event->Prefix);
 			}
 
 			$ids = Array ();
 			$not_processed = array_keys($changes);
 
 			foreach ($changes as $id => $pair) {
 				array_push($ids, $id);
 				$constrain = isset($pair['constrain']) ? $this->normalizeConstrain($pair['constrain']) . ' AND ' : '';
 
 				if ( $pair['old'] == 'new' ) {
 					// replace 0 with newly created item id (from $new_ids mapping)
 					$not_processed[array_search($id, $not_processed)] = $new_ids[$id];
 					$id = $new_ids[$id];
 
 					$sql = 'SELECT MIN(item_table.Priority)
 							FROM ' . $table_name . ' item_table
 							' . $joins . '
 							WHERE ' . $constrain . ' item_table.' . $id_field . ' NOT IN (' . implode(',', $not_processed) . ')';
 					$min_priority = (int)$this->Conn->GetOne($sql) - 1;
 
 					if ( $pair['new'] < $min_priority ) {
 						$pair['new'] = $min_priority;
 					}
 
 					$pair['old'] = $min_priority;
 				}
 
 				if ( $pair['new'] < $pair['old'] ) {
 					$set = '	SET item_table.Priority = item_table.Priority + 1';
 					$where = '	WHERE ' . $constrain . '
 								item_table.Priority >= ' . $pair['new'] . '
 								AND
 								item_table.Priority < ' . $pair['old'] . '
 								AND
 								' . $id_field . ' NOT IN (' . implode(',', $not_processed) . ')';
 				}
 				elseif ( $pair['new'] > $pair['old'] ) {
 					$set = '	SET item_table.Priority = item_table.Priority - 1';
 					$where = '	WHERE ' . $constrain . '
 								item_table.Priority > ' . $pair['old'] . '
 								AND
 								item_table.Priority <= ' . $pair['new'] . '
 								AND
 								' . $id_field . ' NOT IN (' . implode(',', $not_processed) . ')';
 				}
 				else {
 					$set = '	SET item_table.Priority = ' . $pair['new'];
 					$where = '	WHERE ' . $id_field . ' = ' . $id;
 				}
 
 				$sql = 'SELECT item_table.' . $id_field . '
 						FROM ' . $table_name . ' item_table
 						' . $joins . '
 						' . $where;
 				$ids = array_merge($ids, $this->Conn->GetCol($sql));
 
 				$q = 'UPDATE ' . $table_name . ' item_table
 						' . $joins . '
 						' . $set . $where;
 				$this->Conn->Query($q);
 
 				unset($not_processed[array_search($id, $not_processed)]);
 			}
 
 			return $ids;
 		}
 
 		/**
 		 * Recalculates priorities
 		 *
 		 * @param kEvent $event
 		 * @param string $constrain
 		 * @param string $joins
 		 * @return Array
 		 */
 		function recalculatePriorities($event, $constrain = '', $joins = '')
 		{
 			$config = $event->getUnitConfig();
 			$id_field = $config->getIDField();
 			$table_name = $config->getTableName();
 
 			if ( $constrain ) {
 				$constrain = $this->normalizeConstrain($constrain);
 			}
 
 			if ( $this->Application->IsTempMode($event->Prefix, $event->Special) ) {
 				$table_name = $this->Application->GetTempName($table_name, 'prefix:' . $event->Prefix);
 			}
 
 			$sql = 'SELECT ' . $id_field . '
 					FROM ' . $table_name . ' item_table ' .
 					$joins . ' ' .
 					($constrain ? ' WHERE ' . $constrain : '') . '
 					ORDER BY item_table.Priority DESC';
 			$items = $this->Conn->GetCol($sql);
 
 			foreach ($items as $item_number => $item_id) {
 				$sql = 'UPDATE ' . $table_name . '
 						SET Priority = ' . -($item_number + 1) . '
 						WHERE ' . $id_field . ' = ' . $item_id;
 				$this->Conn->Query($sql);
 			}
 
 			return $items;
 		}
 
 		/**
 		 * Adds current table name into constrain if doesn't have it already (to prevent ambiguous columns during joins)
 		 *
 		 * @param string $constrain
 		 * @return string
 		 */
 		function normalizeConstrain($constrain)
 		{
 			if ( strpos($constrain, '.') === false ) {
 				return 'item_table.' . $constrain;
 			}
 
 			return $constrain;
 		}
 
 		/**
 		 * Performs fake kDBItem::Update call, so any OnBefore/OnAfter events would be notified of priority change
 		 *
 		 * @param string $prefix
 		 * @param Array $ids
 		 */
 		function massUpdateChanged($prefix, $ids)
 		{
 			$ids = array_unique($ids);
 
+			/** @var kDBItem $dummy */
 			$dummy = $this->Application->recallObject($prefix . '.-dummy', null, Array ('skip_autoload' => true));
-			/* @var $dummy kDBItem */
 
 			$sql = 	$dummy->GetSelectSQL() . '
 					WHERE ' . $dummy->TableName . '.' . $dummy->IDField . ' IN (' . implode(',', $ids) . ')';
 			$records = $this->Conn->Query($sql);
 
 			foreach ($records as $record) {
 				$dummy->LoadFromHash($record);
 				$dummy->Update();
 			}
 		}
 	}
Index: branches/5.3.x/core/units/helpers/upload_helper.php
===================================================================
--- branches/5.3.x/core/units/helpers/upload_helper.php	(revision 16518)
+++ branches/5.3.x/core/units/helpers/upload_helper.php	(revision 16519)
@@ -1,335 +1,335 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2012 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 class kUploadHelper extends kHelper
 {
 
 	/**
 	 * Creates kUploadHelper instance.
 	 */
 	public function __construct()
 	{
 		parent::__construct();
 
 		// 5 minutes execution time
 		@set_time_limit(5 * 60);
 	}
 
 	/**
 	 * Handles the upload.
 	 *
 	 * @param kEvent $event Event.
 	 *
 	 * @return string
 	 * @throws kUploaderException When upload could not be handled properly.
 	 */
 	public function handle(kEvent $event)
 	{
 		$this->disableBrowserCache();
 
 //		Uncomment this one to fake upload time
 //		sleep(5);
 
 		if ( !$this->Application->HttpQuery->Post ) {
 			// Variables {field, id, flashsid} are always submitted through POST!
 			// When file size is larger, then "upload_max_filesize" (in php.ini),
 			// then these variables also are not submitted.
 			throw new kUploaderException('File size exceeds allowed limit.', 413);
 		}
 
 		if ( !$this->checkPermissions($event) ) {
 			// 403 Forbidden
 			throw new kUploaderException('You don\'t have permissions to upload.', 403);
 		}
 
 		$value = $this->Application->GetVar('file');
 
 		if ( !$value || ($value['error'] != UPLOAD_ERR_OK) ) {
 			// 413 Request Entity Too Large (file uploads disabled OR uploaded file was
 			// too large for web server to accept, see "upload_max_filesize" in php.ini)
 			throw new kUploaderException('File size exceeds allowed limit.', 413);
 		}
 
 		$value = $this->Application->unescapeRequestVariable($value);
 
 		$tmp_path = WRITEABLE . '/tmp/';
 		$filename = $this->getUploadedFilename() . '.tmp';
 		$id = $this->Application->GetVar('id');
 
 		if ( $id ) {
 			$filename = $id . '_' . $filename;
 		}
 
 		if ( !is_writable($tmp_path) ) {
 			// 500 Internal Server Error
 			// check both temp and live upload directory
 			throw new kUploaderException('Write permissions not set on the server, please contact server administrator.', 500);
 		}
 
 		/** @var FileHelper $file_helper */
 		$file_helper = $this->Application->recallObject('FileHelper');
 		$filename = $file_helper->ensureUniqueFilename($tmp_path, $filename);
 		$storage_format = $this->getStorageFormat($this->Application->GetVar('field'), $event);
 
 		if ( $storage_format ) {
+			/** @var ImageHelper $image_helper */
 			$image_helper = $this->Application->recallObject('ImageHelper');
-			/* @var $image_helper ImageHelper */
 
 			$this->moveUploadedFile($value['tmp_name'] . '.jpg'); // add extension, so ResizeImage can work
 			$url = $image_helper->ResizeImage($value['tmp_name'] . '.jpg', $storage_format);
 			$tmp_name = preg_replace('/^' . preg_quote($this->Application->BaseURL(), '/') . '/', '/', $url);
 			rename($tmp_name, $tmp_path . $filename);
 		}
 		else {
 			$this->moveUploadedFile($tmp_path . $filename);
 		}
 
 		$this->deleteTempFiles($tmp_path);
 
 		$thumbs_path = preg_replace('/^' . preg_quote(FULL_PATH, '/') . '/', '', $tmp_path, 1);
 		$thumbs_path = FULL_PATH . THUMBS_PATH . $thumbs_path;
 
 		if ( file_exists($thumbs_path) ) {
 			$this->deleteTempFiles($thumbs_path);
 		}
 
 		return preg_replace('/^' . preg_quote($id, '/') . '_/', '', $filename);
 	}
 
 	/**
 	 * Sends headers to ensure, that response is never cached.
 	 *
 	 * @return void
 	 */
 	protected function disableBrowserCache()
 	{
 		header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
 		header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
 		header('Cache-Control: no-store, no-cache, must-revalidate');
 		header('Cache-Control: post-check=0, pre-check=0', false);
 		header('Pragma: no-cache');
 	}
 
 	/**
 	 * Checks, that flash uploader is allowed to perform upload
 	 *
 	 * @param kEvent $event
 	 * @return bool
 	 */
 	protected function checkPermissions(kEvent $event)
 	{
 		// Flash uploader does NOT send correct cookies, so we need to make our own check
 		$cookie_name = 'adm_' . $this->Application->ConfigValue('SessionCookieName');
 		$this->Application->HttpQuery->Cookie['cookies_on'] = 1;
 		$this->Application->HttpQuery->Cookie[$cookie_name] = $this->Application->GetVar('flashsid');
 
 		// this prevents session from auto-expiring when KeepSessionOnBrowserClose & FireFox is used
 		$this->Application->HttpQuery->Cookie[$cookie_name . '_live'] = $this->Application->GetVar('flashsid');
 
+		/** @var Session $admin_session */
 		$admin_session = $this->Application->recallObject('Session.admin');
-		/* @var $admin_session Session */
 
 		if ( $admin_session->RecallVar('user_id') == USER_ROOT ) {
 			return true;
 		}
 
 		// copy some data from given session to current session
 		$backup_user_id = $this->Application->RecallVar('user_id');
 		$this->Application->StoreVar('user_id', $admin_session->RecallVar('user_id'));
 
 		$backup_user_groups = $this->Application->RecallVar('UserGroups');
 		$this->Application->StoreVar('UserGroups', $admin_session->RecallVar('UserGroups'));
 
 		// check permissions using event, that have "add|edit" rule
 		$check_event = new kEvent($event->getPrefixSpecial() . ':OnProcessSelected');
 		$check_event->setEventParam('top_prefix', $this->Application->GetTopmostPrefix($event->Prefix, true));
 
 		/** @var kEventHandler $event_handler */
 		$event_handler = $this->Application->recallObject($event->Prefix . '_EventHandler');
 		$allowed_to_upload = $event_handler->CheckPermission($check_event);
 
 		// restore changed data, so nothing gets saved to database
 		$this->Application->StoreVar('user_id', $backup_user_id);
 		$this->Application->StoreVar('UserGroups', $backup_user_groups);
 
 		return $allowed_to_upload;
 	}
 
 	/**
 	 * Returns uploaded filename.
 	 *
 	 * @return string
 	 */
 	protected function getUploadedFilename()
 	{
 		if ( isset($_REQUEST['name']) ) {
 			$file_name = $_REQUEST['name'];
 		}
 		elseif ( !empty($_FILES) ) {
 			$file_name = $_FILES['file']['name'];
 		}
 		else {
 			$file_name = uniqid('file_');
 		}
 
 		return $file_name;
 	}
 
 	/**
 	 * Gets storage format for a given field.
 	 *
 	 * @param string $field_name
 	 * @param kEvent $event
 	 * @return bool
 	 */
 	protected function getStorageFormat($field_name, kEvent $event)
 	{
 		$config = $event->getUnitConfig();
 		$field_options = $config->getFieldByName($field_name);
 
 		if ( !$field_options ) {
 			$field_options = $config->getVirtualFieldByName($field_name);
 		}
 
 		return isset($field_options['storage_format']) ? $field_options['storage_format'] : false;
 	}
 
 	/**
 	 * Moves uploaded file to given location.
 	 *
 	 * @param string $file_path File path.
 	 *
 	 * @return void
 	 * @throws kUploaderException When upload could not be handled properly.
 	 */
 	protected function moveUploadedFile($file_path)
 	{
 		// Chunking might be enabled
 		$chunk = (int)$this->Application->GetVar('chunk', 0);
 		$chunks = (int)$this->Application->GetVar('chunks', 0);
 
 		// Open temp file
 		if ( !$out = @fopen("{$file_path}.part", $chunks ? 'ab' : 'wb') ) {
 			throw new kUploaderException('Failed to open output stream.', 102);
 		}
 
 		if ( !empty($_FILES) ) {
 			if ( $_FILES['file']['error'] || !is_uploaded_file($_FILES['file']['tmp_name']) ) {
 				throw new kUploaderException('Failed to move uploaded file.', 103);
 			}
 
 			// Read binary input stream and append it to temp file
 			if ( !$in = @fopen($_FILES['file']['tmp_name'], 'rb') ) {
 				throw new kUploaderException('Failed to open input stream.', 101);
 			}
 		}
 		else {
 			if ( !$in = @fopen('php://input', 'rb') ) {
 				throw new kUploaderException('Failed to open input stream.', 101);
 			}
 		}
 
 		while ( $buff = fread($in, 4096) ) {
 			fwrite($out, $buff);
 		}
 
 		@fclose($out);
 		@fclose($in);
 
 		// Check if file has been uploaded
 		if ( !$chunks || $chunk == $chunks - 1 ) {
 			// Strip the temp .part suffix off
 			rename("{$file_path}.part", $file_path);
 		}
 	}
 
 	/**
 	 * Delete temporary files, that won't be used for sure
 	 *
 	 * @param string $path
 	 * @return void
 	 */
 	protected function deleteTempFiles($path)
 	{
 		$files = glob($path . '*.*');
 		$max_file_date = strtotime('-1 day');
 
 		foreach ( $files as $file ) {
 			if ( filemtime($file) < $max_file_date ) {
 				unlink($file);
 			}
 		}
 	}
 
 	/**
 	 * Prepares object for operations with file on given field.
 	 *
 	 * @param kEvent $event Event.
 	 * @param string $field Field.
 	 *
 	 * @return kDBItem
 	 */
 	public function prepareUploadedFile(kEvent $event, $field)
 	{
+		/** @var kDBItem $object */
 		$object = $event->getObject(Array ('skip_autoload' => true));
-		/* @var $object kDBItem */
 
 		$filename = $this->getSafeFilename();
 
 		if ( !$filename ) {
 			$object->SetDBField($field, '');
 
 			return $object;
 		}
 
 		// set current uploaded file
 		if ( $this->Application->GetVar('tmp') ) {
 			$options = $object->GetFieldOptions($field);
 			$options['upload_dir'] = WRITEBALE_BASE . '/tmp/';
 			unset($options['include_path']);
 			$object->SetFieldOptions($field, $options);
 
 			$filename = $this->Application->GetVar('id') . '_' . $filename;
 		}
 
 		$object->SetDBField($field, $filename);
 
 		return $object;
 	}
 
 	/**
 	 * Returns safe version of filename specified in url
 	 *
 	 * @return bool|string
 	 * @access protected
 	 */
 	protected function getSafeFilename()
 	{
 		$filename = $this->Application->GetVar('file');
 		$filename = $this->Application->unescapeRequestVariable($filename);
 
 		if ( (strpos($filename, '../') !== false) || (trim($filename) !== $filename) ) {
 			// when relative paths or special chars are found template names from url, then it's hacking attempt
 			return false;
 		}
 
 		return $filename;
 	}
 }
 
 
 class kUploaderException extends Exception
 {
 
 }
Index: branches/5.3.x/core/units/helpers/rating_helper.php
===================================================================
--- branches/5.3.x/core/units/helpers/rating_helper.php	(revision 16518)
+++ branches/5.3.x/core/units/helpers/rating_helper.php	(revision 16519)
@@ -1,266 +1,266 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class RatingHelper extends kHelper {
 
 		/**
 		 * One star width/height in pixels
 		 *
 		 * @var int
 		 */
 		var $ratingUnitWidth = 25;
 		var $ratingSmallUnitWidth = 10; //20;
 
 		/**
 		 * Maximal star count
 		 *
 		 * @var int
 		 */
 		var $ratingMaximal = 5;
 
 		var $_phrases = Array (
 			'current_rating' => 'lu_CurrentRating',
 			'vote_title' => 'lu_VoteTitle',
 			'vote_count' => 'lu_VoteCount',
 			'invalid_rating' => 'lu_InvalidRating',
 			'already_voted' => 'lu_AlreadyVoted',
 			'thanks_for_voting' => 'lu_ThanksForVoting',
 		);
 
 		/**
 		 * Draws rating bar for a given category item
 		 *
 		 * @param kDBItem $object
 		 * @param bool $show_div
 		 * @param string $additional_msg
 		 * @param string $additional_style
 		 * @return string
 		 * @access public
 		 */
 		public function ratingBar(&$object, $show_div = true, $additional_msg = '', $additional_style = '')
 		{
 			// 1. user is allowed to vote by permissions
 			$perm_prefix = $object->getUnitConfig()->getPermItemPrefix();
 			$static = !$this->Application->CheckPermission($perm_prefix . '.RATE', 0, $object->GetDBField('CategoryId'));
 
 			// 2. user isn't voting too frequently
 			$spam_helper =& $this->_getSpamHelper($object);
 			$user_voted = $spam_helper->InSpamControl();
 
 			if ( !$static && !$user_voted ) {
 				// allow to set rating when not static and user not voted before
 				$voting_js = $this->getVotingControl($object, $additional_style);
 			}
 			else {
 				$voting_js = '';
 			}
 
 			$msg_info = Array ('text' => $additional_msg, 'class' => Array ());
 
 			if ( $static ) {
 				$msg_info['class'][] = 'static';
 			}
 
 			if ( $user_voted ) {
 				$msg_info['class'][] = 'voted';
 			}
 
 			$rater = $this->ratingBarSimple($this->getAverageRating($object), $voting_js, $msg_info, $additional_style);
 
 			if ( $show_div ) {
 				// adds div around rating stars (when drawing rating first time)
 				$rater = '<div class="inline-rating" id="page_rating_' . $object->GetID() . '">' . $rater . '</div>';
 			}
 
 			return $rater;
 		}
 
 		/**
 		 * Returns average rating
 		 *
 		 * @param kDBItem $object
 		 * @return float|int
 		 */
 		function getAverageRating(&$object)
 		{
 			$total_votes = $object->GetDBField('CachedVotesQty');
 			$total_rating = $object->GetDBField('CachedRating') * $total_votes;
 
 			return $total_votes ? $total_rating / $total_votes : 0;
 		}
 
 		/**
 		 * Draws rating bar for a given category item
 		 *
 		 * @param float $average_rating
 		 * @param string $voting_js
 		 * @param Array $msg_info
 		 * @param string $additional_style
 		 * @return string
 		 * @access public
 		 */
 		public function ratingBarSimple($average_rating, $voting_js = '', $msg_info = null, $additional_style = '')
 		{
 			if ( !isset($msg_info) || !is_array($msg_info) ) {
 				$msg_info = Array ('text' => '', 'class' => Array ());
 			}
 
 			$unit_selected_width = $additional_style ? $this->ratingSmallUnitWidth : $this->ratingUnitWidth;
 			$rating_width = $average_rating ? @number_format($average_rating, 2) * $unit_selected_width : 0;
 
 			$rating2 = $average_rating ? @number_format($average_rating, 2) : 0;
 			$current_rating_text = $this->_replaceInPhrase('current_rating', Array ('<strong>' . $rating2 . '</strong>', $this->ratingMaximal));
 
 			$rater = '	<span class="inline-rating">
 							<ul class="star-rating ' . $additional_style . '" style="width: ' . $unit_selected_width * $this->ratingMaximal . 'px;">
 								<li class="current-rating" style="width: ' . $rating_width . 'px;">' . $current_rating_text . '</li>' . "\n" .
 					 			$voting_js . '
 					 		</ul>
 					 	</span>';
 
 			// this part is disabled for now, will be addressed once properly review
 			/*$rating1 = $average_rating ? @number_format($average_rating, 1) : 0;
 			$rater .= '	<p class="' . implode(' ', $msg_info['class']) . '">' . $this->_replaceInPhrase('vote_title', Array ('<strong>' . $rating1 . '</strong>', $this->ratingMaximal)) . ' (' . $this->_replaceInPhrase('vote_count', Array ($total_votes)) . ') </p>';*/
 
 			if ( $voting_js ) {
 				$rater .= '&nbsp;<span class="' . implode(' ', $msg_info['class']) . '">' . $msg_info['text'] . '</span>';
 			}
 			else {
 				// adds div around rating stars (when drawing rating first time)
 				$rater = '<div class="inline-rating">' . $rater . '</div>';
 			}
 
 			return $rater;
 		}
 
 		/**
 		 * Returns control, used to vote on a given $object
 		 *
 		 * @param kDBItem $object
 		 * @param string $additional_style
 		 * @return string
 		 */
 		function getVotingControl(&$object, $additional_style = '')
 		{
 			$ret = '';
 
 			for ($i = 1; $i <= $this->ratingMaximal; $i++) {
 				$ret .= '<li><a href="#vote-' . $i . '" onclick="aRatingManager.makeVote(' . $i . ', \'' . $object->Prefix . '\', ' . $object->GetID() . ', \'' . $additional_style . '\'); return false;" title="' . $this->_replaceInPhrase('vote_title', Array ($i, $this->ratingMaximal)) . '" class="r' . $i . '-unit rater" rel="nofollow">' . $i . '</a></li>' . "\n";
 			}
 
 			return $ret;
 		}
 
 		/**
 		 * Saves user's vote, when allowed
 		 *
 		 * @param kDBItem $object
 		 * @return string
 		 */
 		function makeVote(&$object)
 		{
 			$spam_helper =& $this->_getSpamHelper($object);
 
 			if (!$object->isLoaded() || $spam_helper->InSpamControl()) {
 				return '@err:' . $this->_replaceInPhrase('already_voted');
 			}
 
 			$perm_prefix = $object->getUnitConfig()->getPermItemPrefix();
 			$can_rate = $this->Application->CheckPermission($perm_prefix . '.RATE', 0, $object->GetDBField('CategoryId'));
 			$rating = (int)$this->Application->GetVar('rating'); // not numeric rating is from GoogleBot :(
 			$additional_style = $this->Application->GetVar('size');
 
 			if (($rating <= 0) || ($rating > $this->ratingMaximal) || !$can_rate) {
 				return '@err:' . $this->_replaceInPhrase('invalid_rating');
 			}
 
 			// save current rating
 			$fields_hash = Array (
 				'ItemId'		=>	$object->GetID(),
 				'RatingValue'	=>	$rating,
 				'IPAddress'		=>	$this->Application->getClientIp(),
 				'CreatedOn'		=>	time(),
 			);
 			$this->Conn->doInsert($fields_hash, TABLE_PREFIX.'CatalogRatings');
 
 			// recalculate average rating
 			$votes_count = $object->GetDBField('CachedVotesQty');
 			$avg_rating = $object->GetDBField('CachedRating');
 
 			$avg_rating = round((($votes_count * $avg_rating) + $rating) / ($votes_count + 1), 2);
 			$object->SetDBField('CachedRating', "$avg_rating");
 			$object->Update();
 
 			$sql = 'UPDATE '.$object->TableName.'
 					SET CachedVotesQty = CachedVotesQty + 1
 					WHERE '.$object->IDField.' = '.$object->GetID();
 			$this->Conn->Query($sql);
 
 			$object->SetDBField('CachedVotesQty', $object->GetDBField('CachedVotesQty') + 1); // for using in template
 
 			// prevent user from voting too quickly
 			$spam_helper->AddToSpamControl();
 
 			return $this->ratingBar($object, false, '<span class="thanks">' . $this->_replaceInPhrase('thanks_for_voting') . '</span>', $additional_style);
 		}
 
 		/*function purgeVotes()
 		{
 			$expired = time() - 86400 * $this->Application->ConfigValue('Timeout_Rating'); // 3600
 
 			$sql = 'DELETE FROM ' . TABLE_PREFIX . 'CatalogRatings
 					WHERE CreatedOn < ' . $expired;
 			$this->Conn->Query($sql);
 		}*/
 
 		/**
 		 * Performs sprintf on phrase translation using given variables
 		 *
 		 * @param string $phrase
 		 * @param Array $arguments
 		 * @return string
 		 */
 		function _replaceInPhrase($phrase, $arguments = Array ())
 		{
 			$value = $this->Application->Phrase($this->_phrases[$phrase], false);
 
 			if ($arguments) {
 				return vsprintf($value, $arguments);
 			}
 
 			return $value;
 		}
 
 		/**
 		 * Returns SpamHelper object linked to given object
 		 *
 		 * @param kDBItem $object
 		 * @return SpamHelper
 		 * @access protected
 		 */
 		protected function &_getSpamHelper(&$object)
 		{
+			/** @var SpamHelper $spam_helper */
 			$spam_helper = $this->Application->recallObject('SpamHelper');
-			/* @var $spam_helper SpamHelper */
 
 			// 2. user isn't voting too frequently
 			$config_mapping = $object->getUnitConfig()->getConfigMapping();
 			$review_settings = $config_mapping['RatingDelayValue'] . ':' . $config_mapping['RatingDelayInterval'];
 			$spam_helper->InitHelper($object->GetDBField('ResourceId'), 'Rating', $review_settings, $object->GetCol('ResourceId'));
 
 			return $spam_helper;
 		}
 	}
\ No newline at end of file
Index: branches/5.3.x/core/units/helpers/country_states_helper.php
===================================================================
--- branches/5.3.x/core/units/helpers/country_states_helper.php	(revision 16518)
+++ branches/5.3.x/core/units/helpers/country_states_helper.php	(revision 16519)
@@ -1,245 +1,245 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class kCountryStatesHelper extends kHelper
 	{
 
 		/**
 		 * ID of current language.
 		 *
 		 * @var integer
 		 */
 		protected $currentLanguage;
 
 		/**
 		 * ID of primary language.
 		 *
 		 * @var integer
 		 */
 		protected $primaryLanguage;
 
 		/**
 		 * Populates language ids that are used.
 		 */
 		public function __construct()
 		{
 			parent::__construct();
 
 			// Don't use GetVar('m_lang') since it's always equals to default language on editing form in admin.
 			$this->currentLanguage = $this->Application->Phrases->LanguageId;
 			$this->primaryLanguage = $this->Application->GetDefaultLanguageId();
 		}
 
 		/**
 		 * Returns countries, that have states
 		 *
 		 * @return Array
 		 */
 		function getCountriesWithStates()
 		{
 			static $cache = null;
 
 			if ( !isset($cache) ) {
 				$table_name = $this->Application->getUnitConfig('country-state')->getTableName();
 
 				$sql = 'SELECT DISTINCT cname.IsoCode, cid.StateCountryId
 						FROM ' . $table_name . ' cid
 						JOIN ' . $table_name . ' cname ON cname.CountryStateId = cid.StateCountryId
 						WHERE cid.StateCountryId IS NOT NULL';
 				$cache = $this->Conn->GetCol($sql, 'StateCountryId');
 			}
 
 			return $cache;
 		}
 
 		/**
 		 * Checks, that country with given 3symbol ISO code has states
 		 *
 		 * @param string $country_code
 		 * @return bool
 		 */
 		function CountryHasStates($country_code)
 		{
 			return $country_code ? in_array($country_code, $this->getCountriesWithStates()) : false;
 		}
 
 		/**
 		 * Prepares states dropdown based on country selected
 		 *
 		 * @param kEvent $event
 		 * @param string $state_field
 		 * @param string $country_field
 		 */
 		function PopulateStates($event, $state_field, $country_field)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$country_iso = $object->GetDBField($country_field);
 
 			if ( !$country_iso ) {
 				return;
 			}
 
 			$field_options = $object->GetFieldOptions($state_field);
 			$field_options['options'] = $this->getStates($country_iso);
 			$object->SetFieldOptions($state_field, $field_options, $object->isVirtualField($state_field));
 		}
 
 		/**
 		 * Returns list of given country states
 		 *
 		 * @param string $country_iso
 		 * @return Array
 		 */
 		public function getStates($country_iso)
 		{
 			$country_id = $this->getCountryStateId($country_iso, DESTINATION_TYPE_COUNTRY);
 
 			if ( !$country_id ) {
 				return Array ();
 			}
 
 			$cache_key = 'country_states[%CountryStateSerial%]';
 			$cache_key .= ':PL=' . $this->primaryLanguage . ':CL=' . $this->currentLanguage . ':ISO=' . $country_iso;
 			$states = $this->Application->getCache($cache_key);
 
 			if ( $states === false ) {
 				$sql = 'SELECT IF(l' . $this->currentLanguage . '_Name = "", l' . $this->primaryLanguage . '_Name, l' . $this->currentLanguage . '_Name) AS Name, IsoCode
 					FROM ' . $this->Application->getUnitConfig('country-state')->getTableName() . '
 					WHERE (Type = ' . DESTINATION_TYPE_STATE . ') AND (StateCountryId = ' . $country_id . ')
 					ORDER BY Name ASC';
 				$states = $this->Conn->GetCol($sql, 'IsoCode');
 
 				$this->Application->setCache($cache_key, $states);
 			}
 
 			return $states;
 		}
 
 		/**
 		 * Returns valid state ISO code for state name and country code passed
 		 *
 		 * @param string $state_name
 		 * @param string $country_iso
 		 * @return string
 		 */
 		function getStateIso($state_name, $country_iso)
 		{
 			if ( !$this->CountryHasStates($country_iso) ) {
 				return $state_name;
 			}
 
 			$table_name = $this->Application->getUnitConfig('country-state')->getTableName();
 			$country_id = $this->getCountryStateId($country_iso, DESTINATION_TYPE_COUNTRY);
 
 			$sql = 'SELECT IsoCode
 					FROM ' . $table_name . '
 					WHERE (Type = ' . DESTINATION_TYPE_STATE . ') AND (StateCountryId = %1$s) AND
 						(
 							(IsoCode = %2$s) OR (UPPER(l%3$s_Name) = %2$s) OR (UPPER(l%4$s_Name) = %2$s)
 						)';
 
 			$state_name = trim(mb_strtoupper($state_name));
 			$sql = sprintf($sql, $country_id, $this->Conn->qstr($state_name), $this->currentLanguage, $this->primaryLanguage);
 
 			return $this->Conn->GetOne($sql);
 		}
 
 		/**
 		 * Checks, that entered state matches entered country
 		 *
 		 * @param kEvent $event
 		 * @param string $state_field
 		 * @param string $country_field
 		 * @param bool $auto_required
 		 * @return void
 		 */
 		function CheckStateField($event, $state_field, $country_field, $auto_required = true)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$country_iso = $object->GetDBField($country_field);
 
 			if ( $auto_required ) {
 				$object->setRequired($state_field, $this->CountryHasStates($country_iso));
 			}
 
 			$state = $object->GetDBField($state_field);
 
 			if ( $country_iso && $state ) {
 				$state_iso = $this->getStateIso($state, $country_iso);
 
 				if ( $state_iso !== false ) {
 					// replace state name with it's ISO code
 					$object->SetDBField($state_field, $state_iso);
 				}
 				else {
 					// state not found by name -> report error
 					$object->SetError($state_field, 'invalid_state', 'la_invalid_state');
 				}
 			}
 		}
 
 		/**
 		 * Returns country/state id based on given iso code and it's type
 		 *
 		 * @param string $iso_code
 		 * @param int $type
 		 * @return int
 		 */
 		function getCountryStateId($iso_code, $type)
 		{
 			$config = $this->Application->getUnitConfig('country-state');
 			$cache_key = 'country_state_id[%CountryStateSerial%]:ISO=' . $iso_code . ';Type=' . $type;
 			$id = $this->Application->getCache($cache_key);
 
 			if ( $id === false ) {
 				$sql = 'SELECT ' . $config->getIDField() . '
 						FROM ' . $config->getTableName() . '
 						WHERE (Type = ' . $type . ') AND (IsoCode = ' . $this->Conn->qstr($iso_code) . ')';
 				$id = (int)$this->Conn->GetOne($sql);
 
 				$this->Application->setCache($cache_key, $id);
 			}
 
 			return $id;
 		}
 
 		/**
 		 * Returns 3 symbols ISO code from 2 symbols ISO code or otherwise, when $from_short parameter is used
 		 *
 		 * @param string $iso_code
 		 * @param bool $from_short
 		 * @return string
 		 */
 		function getCountryIso($iso_code, $from_short = false)
 		{
 			if ($from_short) {
 				$sql = 'SELECT IsoCode
 						FROM ' . TABLE_PREFIX . 'CountryStates
 						WHERE ShortIsoCode = ' . $this->Conn->qstr($iso_code) . ' AND `Type` = ' . DESTINATION_TYPE_COUNTRY;
 			}
 			else {
 				$sql = 'SELECT ShortIsoCode
 						FROM ' . TABLE_PREFIX . 'CountryStates
 						WHERE IsoCode = ' . $this->Conn->qstr($iso_code) . ' AND `Type` = ' . DESTINATION_TYPE_COUNTRY;
 			}
 
 			return $this->Conn->GetOne($sql);
 		}
 	}
Index: branches/5.3.x/core/units/helpers/mime_decode_helper.php
===================================================================
--- branches/5.3.x/core/units/helpers/mime_decode_helper.php	(revision 16518)
+++ branches/5.3.x/core/units/helpers/mime_decode_helper.php	(revision 16519)
@@ -1,494 +1,494 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	/**
 	 * The MIME decoding class
 	 *
 	 */
 	class MimeDecodeHelper extends kHelper {
 
 		/**
 		 * Contains headers part of email message
 		 *
 		 * @var string
 		 */
 		var $_headerPart;
 
 		/**
 		 * Contains body part of email message
 		 *
 		 * @var string
 		 */
 		var $_bodyPart;
 
 		/**
 		 * Last parsing error message (if any)
 		 *
 		 * @var string
 		 */
 		var $_lastErrorMessage = '';
 
 		/**
 		 * Decode message headers
 		 *
 		 * @var bool
 		 */
 		var $_decodeHeaders = false;
 
 		/**
 		 * Include email body in decoded result
 		 *
 		 * @var bool
 		 */
 		var $_includeBodies = true;
 
 		/**
 		 * Decode email body (only in case, when it will be included in result)
 		 *
 		 * @var bool
 		 */
 		var $_decodeBodies = false;
 
 		/**
 		 * Displays parsing error
 		 *
 		 * @param string $str
 		 */
 		function raiseError($str)
 		{
 			trigger_error('Error during email parsing: ' . $str, E_USER_WARNING);
 		}
 
 		/**
 		 * Initializes mime parsing using given email message
 		 *
 		 * @param string $message
 		 */
 		function InitHelper($message = null)
 		{
 			if (!isset($message)) {
 				return ;
 			}
 
 			list ($header, $body) = $this->_splitBodyHeader($message);
 
 			$this->_headerPart = $header;
 			$this->_bodyPart = $body;
 		}
 
 		/**
 		 * Decodes email message, that was previously set using InitHelper method
 		 *
 		 * @param bool $decode_headers
 		 * @param bool $include_bodies
 		 * @param bool $decode_bodies
 		 * @return stdClass
 		 */
 		function decode($decode_headers = false, $include_bodies = false, $decode_bodies = false)
 		{
 			$this->_decodeHeaders = $decode_headers;
 			$this->_includeBodies = $include_bodies;
 			$this->_decodeBodies  = $decode_bodies;
 
 			$ret = $this->decodePart($this->_headerPart, $this->_bodyPart);
 
 			if ($ret === false) {
 				$this->raiseError($this->_lastErrorMessage);
 
 				return false;
 			}
 
 			return $ret;
 		}
 
 		function decodePart($headers, $body, $default_ctype = 'text/plain', $only_headers = false)
 		{
 			$return = new stdClass;
 
 			// process headers
 			$return->headers = Array ();
 			$headers = $this->_parseHeaders($headers, $this->_decodeHeaders);
 			$single_headers = Array ('subject', 'from', 'to', 'cc', 'reply-to', 'date');
 
 			foreach ($headers as $value) {
 				$header_name = strtolower($value['name']);
 				$header_value = $only_headers ? $this->_decodeHeader($value['value']) : $value['value'];
 
 				if (array_key_exists($header_name, $return->headers) && !is_array($return->headers[$header_name]) && !in_array($header_name, $single_headers)) {
 					// this is not a single header, so convert it to array, when 2nd value is found
 					$return->headers[$header_name] = Array ( $return->headers[$header_name] );
 					$return->headers[$header_name][] = $header_value;
 				}
 				elseif (array_key_exists($header_name, $return->headers) && !in_array($header_name, $single_headers)) {
 					$return->headers[$header_name][] = $header_value;
 				}
 				else {
 					$return->headers[$header_name] = $header_value;
 				}
 			}
 
 			if ($only_headers) {
 				return $return->headers;
 			}
 
 			foreach ($headers as $value) {
 				$header_name = strtolower($value['name']);
 				$header_value = $value['value'];
 
 				switch ($header_name) {
 					case 'content-type':
 						$content_type = $this->_parseHeaderValue($header_value);
 
 						if (preg_match('/([0-9a-z+.-]+)\/([0-9a-z+.-]+)/i', $content_type['value'], $regs)) {
 							// "text/plain", "text/html", etc.
 							$return->ctype_primary   = $regs[1];
 							$return->ctype_secondary = $regs[2];
 						}
 
 						if (array_key_exists('other', $content_type)) {
 							// "charset", etc.
 							foreach ($content_type['other'] as $p_name => $p_value) {
 								$return->ctype_parameters["$p_name"] = $p_value;
 							}
 						}
 						break;
 
 					case 'content-disposition';
 						$content_disposition = $this->_parseHeaderValue($header_value);
 						$return->disposition = $content_disposition['value'];
 
 						if (array_key_exists('other', $content_disposition)) {
 							// "filename", etc.
 							foreach ($content_disposition['other'] as $p_name => $p_value) {
 								$return->d_parameters["$p_name"] = $p_value;
 							}
 						}
 						break;
 
 					case 'content-transfer-encoding':
 						$content_transfer_encoding = $this->_parseHeaderValue($header_value);
 						break;
 				}
 			}
 
 			// process message body
 			if (isset($content_type)) {
 				switch ( strtolower($content_type['value']) ) {
 					case 'text/plain':
 					case 'text/html':
 						if ($this->_includeBodies) {
 							$encoding = isset($content_transfer_encoding) ? $content_transfer_encoding['value'] : '7bit';
 							$return->body = $this->_decodeBodies ? $this->_decodeBody($body, $encoding) : $body;
 						}
 						break;
 
 					case 'multipart/parallel':
 					case 'multipart/report': // RFC1892
 					case 'multipart/signed': // PGP
 					case 'multipart/digest':
 					case 'multipart/alternative':
 					case 'multipart/appledouble':
 					case 'multipart/related':
 					case 'multipart/mixed':
 						if (!isset($content_type['other']['boundary'])) {
 							$this->_lastErrorMessage = 'No boundary found for ' . $content_type['value'] . ' part';
 							return false;
 						}
 
 						$default_ctype = (strtolower($content_type['value']) === 'multipart/digest') ? 'message/rfc822' : 'text/plain';
 
 						$parts = $this->_boundarySplit($body, $content_type['other']['boundary']);
 
 						for ($i = 0; $i < count($parts); $i++) {
 							list ($part_header, $part_body) = $this->_splitBodyHeader($parts[$i]);
 							$part = $this->decodePart($part_header, $part_body, $default_ctype);
 
 							if ($part === false) {
 								// part is broken
 								$this->raiseError($this->_lastErrorMessage);
 							}
 
 							$return->parts[] = $part;
 						}
 						break;
 
 					case 'message/rfc822':
 					case 'message/disposition-notification':
 						// create another instance, not to interfear with main parser
+						/** @var MimeDecodeHelper $mime_decode_helper */
 						$mime_decode_helper = $this->Application->makeClass('MimeDecodeHelper');
-						/* @var $mime_decode_helper MimeDecodeHelper */
 
 						$mime_decode_helper->InitHelper($body);
 
 						$return->parts[] = $mime_decode_helper->decode(true, $this->_includeBodies, $this->_decodeBodies);
 						unset($mime_decode_helper);
 						break;
 
 					default:
 						if ($this->_includeBodies) {
 							$encoding = isset($content_transfer_encoding) ? $content_transfer_encoding['value'] : '7bit';
 							$return->body = $this->_decodeBodies ? $this->_decodeBody($body, $encoding) : $body;
 						}
 						break;
 				}
 
 			} else {
 				$ctype = explode('/', $default_ctype);
 				$return->ctype_primary = $ctype[0];
 				$return->ctype_secondary = $ctype[1];
 
 				if ($this->_includeBodies) {
 					$return->body = $this->_decodeBodies ? $this->_decodeBody($body) : $body;
 				}
 			}
 
 			return $return;
 		}
 
 		/**
 		 * Divides message into header and body parts
 		 *
 		 * @param string $input
 		 * @return Array
 		 */
 		function _splitBodyHeader($input)
 		{
 			if (strpos($input, "\r\n\r\n") === false) {
 				return Array ($input, '');
 			} elseif (preg_match("/^(.*?)\r?\n\r?\n(.*)/s", $input, $match)) {
 				return Array ($match[1], $match[2]);
 			} else {
 				$this->_lastErrorMessage = 'Could not split header and body';
 
 				return false;
 			}
 		}
 
 		/**
 		 * Parses headers string into array and optionally decode them
 		 *
 		 * @param string $input
 		 * @param bool $decode
 		 * @return Array
 		 */
 		function _parseHeaders($input, $decode = false)
 		{
 			if (!$input) {
 				return Array ();
 			}
 
 			$ret = Array ();
 
 			// Unfold the input
 			$input   = preg_replace("/\r\n/", "\n", $input);
 			$input   = preg_replace("/\n(\t| )+/", ' ', $input);
 			$headers = explode("\n", trim($input));
 
 			foreach ($headers as $value) {
 				$pos = strpos($value, ':');
 				$hdr_name = substr($value, 0, $pos);
 				$hdr_value = substr($value, $pos + 1);
 
 				if ($hdr_value[0] == ' ') {
 					$hdr_value = substr($hdr_value, 1);
 				}
 
 				$ret[] = Array (
 					'name'  => $hdr_name,
 					'value' => $decode ? $this->_decodeHeader($hdr_value) : $hdr_value
 				);
 			}
 
 			return $ret;
 		}
 
 		/**
 		 * Parses header value in following format (without quotes): "multipart/alternative; boundary=001636c9274051e332048498d8cc"
 		 *
 		 * @param string $input
 		 * @return Array
 		 */
 		function _parseHeaderValue($input)
 		{
 			$ret = Array ();
 			$pos = strpos($input, ';');
 
 			if ($pos === false) {
 				$ret['value'] = trim($input);
 
 				return $ret;
 			}
 
 			// get text until first ";"
 			$ret['value'] = trim(substr($input, 0, $pos));
 			$input = trim(substr($input, $pos + 1));
 
 			if (strlen($input) > 0) {
 				// This splits on a semi-colon, if there's no preceeding backslash
 				// Can't handle if it's in double quotes however. (Of course anyone
 				// sending that needs a good slap).
 				$parameters = preg_split('/\s*(?<!\\\\);\s*/i', $input);
 
 				for ($i = 0; $i < count($parameters); $i++) {
 					$pos = strpos($parameters[$i], '=');
 					$param_name  = substr($parameters[$i], 0, $pos);
 					$param_value = substr($parameters[$i], $pos + 1);
 
 					if ($param_value[0] == '"') {
 						$param_value = substr($param_value, 1, -1);
 					}
 
 					$ret['other']["$param_name"] = $param_value;
 					$ret['other'][ strtolower($param_name) ] = $param_value;
 				}
 			}
 
 			return $ret;
 		}
 
 		/**
 		 * Splits input body using given boundary
 		 *
 		 * @param string $input
 		 * @param string $boundary
 		 * @return Array
 		 */
 		function _boundarySplit($input, $boundary)
 		{
 			$tmp = explode('--' . $boundary, $input);
 
 			for ($i = 1; $i < count($tmp) - 1; $i++) {
 				$parts[] = $tmp[$i];
 			}
 
 			return $parts;
 		}
 
 		/**
 		 * Decode message header value
 		 *
 		 * @param string $input
 		 * @return string
 		 */
 		function _decodeHeader($input)
 		{
 			// Remove white space between encoded-words (http://www.ietf.org/rfc/rfc2047.txt)
 			$regexp = '/(=\?[^?]+\?(Q|B)\?[^?]*\?=)(\s)+=\?/i';
 
 			while (preg_match($regexp, $input)) {
 				// process each word separately
 				$input = preg_replace($regexp, '\1=?', $input);
 			}
 
 			// For each encoded-word...
 			while (preg_match('/(=\?([^?]+)\?(Q|B)\?([^?]*)\?=)/i', $input, $matches)) {
 				$encoded = $matches[1];
 				$charset = $matches[2];
 				$encoding = $matches[3];
 				$text = $matches[4];
 
 				switch (strtoupper($encoding)) {
 					case 'B':
 						$text = base64_decode($text);
 						break;
 
 					case 'Q':
 						// $text = $this->_quotedPrintableDecode($text);
 						$text = str_replace('_', ' ', $text);
 						preg_match_all('/=([a-f0-9]{2})/i', $text, $matches);
 
 						foreach($matches[1] as $value) {
 							$text = str_replace('=' . $value, chr(hexdec($value)), $text);
 						}
 						break;
 				}
 
 				$input = $this->convertEncoding($charset, str_replace($encoded, $text, $input));
 			}
 
 			return $input;
 		}
 
 		/**
 		 * Converts encoding to one, that site uses
 		 *
 		 * @param string $from_encoding
 		 * @param string $text
 		 * @return string
 		 * @author Alex
 		 */
 		function convertEncoding($from_encoding, $text)
 		{
 			if ( !function_exists('mb_convert_encoding') ) {
 				// if mbstring extension not installed
 				return $text;
 			}
 
 			static $to_encoding = false;
 
 			if ( $to_encoding === false ) {
 				$to_encoding = CHARSET;
 			}
 
 			return mb_convert_encoding($text, $to_encoding, $from_encoding);
 
 		}
 
 		/**
 		 * Decodes message body
 		 *
 		 * @param string $input
 		 * @param string $encoding
 		 * @return string
 		 */
 		function _decodeBody($input, $encoding = '7bit')
 		{
 			switch (strtolower($encoding)) {
 				case 'quoted-printable':
 					return $this->_quotedPrintableDecode($input);
 					break;
 
 				case 'base64':
 					return base64_decode($input);
 					break;
 			}
 
 			// for 7bit, 8bit, anything else
 			return $input;
 		}
 
 		/**
 		 * Decodes "quoted-printable" encoding
 		 *
 		 * @param string $string
 		 * @return string
 		 */
 		function _quotedPrintableDecode($string)
 		{
 			// Remove soft line breaks
 			$string = preg_replace("/=\r?\n/", '', $string);
 
 			// Replace encoded characters
 			if (preg_match_all('/=[a-f0-9]{2}/i', $string, $matches)) {
 				$matches = array_unique($matches[0]);
 				foreach ($matches as $value) {
 					$string = str_replace($value, chr(hexdec(substr($value,1))), $string);
 				}
 			}
 
 			return $string;
 		}
 	}
\ No newline at end of file
Index: branches/5.3.x/core/units/helpers/csv_helper.php
===================================================================
--- branches/5.3.x/core/units/helpers/csv_helper.php	(revision 16518)
+++ branches/5.3.x/core/units/helpers/csv_helper.php	(revision 16519)
@@ -1,408 +1,409 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	kUtil::safeDefine('EXPORT_STEP', 100); // export by 100 items
 	kUtil::safeDefine('IMPORT_STEP', 10);
 
 	class kCSVHelper extends kHelper {
 
 		var $PrefixSpecial;
 		var $grid;
 
 		var $delimiter_mapping = Array(0 => "\t", 1 => ',', 2 => ';', 3 => ' ', 4 => ':');
 		var $enclosure_mapping = Array(0 => '"', 1 => "'");
 		var $separator_mapping = Array(0 => "\n", 1 => "\r\n");
 
 		function ExportStep()
 		{
 			$export_data = $this->Application->RecallVar('export_data');
 			$export_rand = $this->Application->RecallVar('export_rand');
 			$get_rand = $this->Application->GetVar('export_rand');
 
+			/** @var FileHelper $file_helper */
 			$file_helper = $this->Application->recallObject('FileHelper');
-			/* @var $file_helper FileHelper */
 
 			if ( $export_data && $export_rand == $get_rand ) {
 				$export_data = unserialize($export_data);
 				$first_step = false;
 			}
 			else {
 				// first step
 				$export_data = Array ();
 				$export_data['prefix'] = $this->PrefixSpecial;
 				$export_data['grid'] = $this->grid;
 				$export_data['file_name'] = EXPORT_PATH . '/' . $file_helper->ensureUniqueFilename(EXPORT_PATH, 'export_' . $export_data['prefix'] . '.csv');
 				$export_data['step'] = EXPORT_STEP;
 				$export_data['delimiter'] = $this->delimiter_mapping[(int)$this->Application->ConfigValue('CSVExportDelimiter')];
 				$export_data['enclosure'] = $this->enclosure_mapping[(int)$this->Application->ConfigValue('CSVExportEnclosure')];
 				$export_data['record_separator'] = $this->separator_mapping[(int)$this->Application->ConfigValue('CSVExportSeparator')];
 				$export_data['page'] = 1;
 				$export_data['source_encoding'] = strtoupper(CHARSET);
 				$export_data['encoding'] = $this->Application->ConfigValue('CSVExportEncoding') ? false : 'UTF-16LE';
 
 				$this->Application->StoreVar('export_rand', $get_rand);
 
 				$first_step = true;
 			}
 
 			$file = fopen($export_data['file_name'], $first_step ? 'w' : 'a');
 
 			$prefix_elements = preg_split('/\.|_/', $export_data['prefix'], 2);
 			$grid_config = $this->_getGridColumns($prefix_elements[0], $export_data['grid']);
 
 			$list_params = Array ('per_page' => $export_data['step'], 'grid' => $export_data['grid']);
+
+			/** @var kDBList $list */
 			$list = $this->Application->recallObject(rtrim(implode('.', $prefix_elements), '.'), $prefix_elements[0] . '_List', $list_params);
-			/* @var $list kDBList */
 
 			$list->SetPage($export_data['page']);
 			$list->Query();
 			$list->GoFirst();
 
 			$picker_helper = new kColumnPickerHelper(rtrim(implode('.', $prefix_elements), '.'), $export_data['grid']);
 			$grid_config = $picker_helper->apply($grid_config);
 
 			if ( $first_step ) {
 				// if UTF-16, write Unicode marker
 				if ( $export_data['encoding'] == 'UTF-16LE' ) {
 					fwrite($file, chr(0xFF) . chr(0xFE));
 				}
 
 				// inserting header line
 				$headers = Array ();
 				foreach ($grid_config as $field_name => $field_data) {
 					$use_phrases = array_key_exists('use_phrases', $field_data) ? $field_data['use_phrases'] : true;
 					$field_title = isset($field_data['title']) ? $field_data['title'] : 'column:la_fld_' . $field_name;
 					$header = $use_phrases ? $this->Application->Phrase($field_title) : $field_title;
 					array_push($headers, $header);
 				}
 
 				$csv_line = kUtil::getcsvline($headers, $export_data['delimiter'], $export_data['enclosure'], $export_data['record_separator']);
 				if ( $export_data['encoding'] ) {
 					$csv_line = mb_convert_encoding($csv_line, $export_data['encoding'], $export_data['source_encoding']);
 				}
 				fwrite($file, $csv_line);
 			}
 
 			while (!$list->EOL()) {
 				$data = Array ();
 				foreach ($grid_config as $field_name => $field_data) {
 					if ( isset($field_data['export_field']) ) {
 						$field_name = $field_data['export_field'];
 					}
 					$value = $list->GetField($field_name, isset($field_data['format']) ? $field_data['format'] : null);
 					$value = str_replace("\r\n", "\n", $value);
 					$value = str_replace("\r", "\n", $value);
 					array_push($data, $value);
 				}
 
 				if ( $export_data['encoding'] == 'UTF-16LE' ) {
 					fwrite($file, chr(0xFF) . chr(0xFE));
 				}
 
 				$csv_line = kUtil::getcsvline($data, $export_data['delimiter'], $export_data['enclosure'], $export_data['record_separator']);
 				if ( $export_data['encoding'] ) {
 					$csv_line = mb_convert_encoding($csv_line, $export_data['encoding'], $export_data['source_encoding']);
 				}
 				fwrite($file, $csv_line);
 
 				$list->GoNext();
 			}
 
 			$records_processed = $export_data['page'] * $export_data['step'];
 			$percent_complete = min($records_processed / $list->GetRecordsCount() * 100, 100);
 
 			fclose($file);
 
 			if ( $records_processed >= $list->GetRecordsCount() ) {
 				$this->Application->StoreVar('export_data', serialize($export_data));
 				$this->Application->Redirect($this->Application->GetVar('finish_template'));
 			}
 
 			echo $percent_complete;
 
 			$export_data['page']++;
 			$this->Application->StoreVar('export_data', serialize($export_data));
 		}
 
 		function ExportData($name)
 		{
 			$export_data = unserialize($this->Application->RecallVar('export_data'));
 			return isset($export_data[$name]) ? $export_data[$name] : false;
 		}
 
 		/**
 		 * Returns prefix from request or from stored import/export data
 		 *
 		 * @param bool $is_import
 		 * @return string
 		 */
 		public function getPrefix($is_import = false)
 		{
 			$prefix = $this->Application->GetVar('PrefixSpecial');
 
 			if ( !$prefix ) {
 				return $is_import ? $this->ImportData('prefix') : $this->ExportData('prefix');
 			}
 
 			return $prefix;
 		}
 
 		function GetCSV()
 		{
 			kUtil::safeDefine('DBG_SKIP_REPORTING', 1);
 
 			$export_data = unserialize($this->Application->RecallVar('export_data'));
 			$filename = preg_replace('/(.*)\.csv$/', '\1', basename($export_data['file_name'])) . '.csv';
 
 			$this->Application->setContentType('text/csv');
 			header('Content-Disposition: attachment; filename="' . $filename . '"');
 			readfile($export_data['file_name']);
 			die();
 		}
 
 		function ImportStart($filename)
 		{
 			if ( !file_exists($filename) || !is_file($filename) ) {
 				return 'cant_open_file';
 			}
 
 			$import_data = Array ();
 			$import_data['source_encoding'] = strtoupper(CHARSET);
 			$import_data['encoding'] = $this->Application->ConfigValue('CSVExportEncoding') ? false : 'UTF-16LE';
 			$import_data['errors'] = '';
 
 			// convert file in case of UTF-16LE
 			if ( $import_data['source_encoding'] != $import_data['encoding'] ) {
 				copy($filename, $filename . '.orginal');
 				$file_content = file_get_contents($filename);
 				$file = fopen($filename, 'w');
 				fwrite($file, mb_convert_encoding(str_replace(chr(0xFF) . chr(0xFE), '', $file_content), $import_data['source_encoding'], $import_data['encoding']));
 				fclose($file);
 			}
 
 			$import_data['prefix'] = $this->PrefixSpecial;
 			$import_data['grid'] = $this->grid;
 			$import_data['file'] = $filename;
 			$import_data['total_lines'] = count(file($filename));
 
 			if ( !$import_data['total_lines'] ) {
 				$import_data['total_lines'] = 1;
 			}
 
 			unset($file_content);
 			$import_data['lines_processed'] = 0;
 			$import_data['delimiter'] = $this->delimiter_mapping[(int)$this->Application->ConfigValue('CSVExportDelimiter')];
 			$import_data['enclosure'] = $this->enclosure_mapping[(int)$this->Application->ConfigValue('CSVExportEnclosure')];
 			$import_data['step'] = IMPORT_STEP;
 			$import_data['not_imported_lines'] = '';
 			$import_data['added'] = 0;
 			$import_data['updated'] = 0;
 
 			$file = fopen($filename, 'r');
 			// getting first line for headers
 			$headers = fgetcsv($file, 8192, $import_data['delimiter'], $import_data['enclosure']);
 			fclose($file);
 
 			$prefix_elements = preg_split('/\.|_/', $import_data['prefix'], 2);
 			$grid_config = $this->_getGridColumns($prefix_elements[0], $import_data['grid']);
 
 			$field_list = Array();
 
 			foreach ($grid_config as $field_name => $field_data) {
 				if ( isset($field_data['export_field']) ) {
 					$field_name = $field_data['export_field'];
 				}
 
 				$field_title = isset($field_data['title']) ? $field_data['title'] : 'column:la_fld_' . $field_name;
 				$field_label = $this->Application->Phrase($field_title);
 				$field_pos = array_search($field_label, $headers);
 
 				if ( $field_pos !== false ) {
 					$field_list[$field_pos] = $field_name;
 				}
 			}
 
 			if ( !count($field_list) ) {
 				return 'no_matching_columns';
 			}
 
 			$import_data['field_list'] = $field_list;
 
 			// getting key list
 			$field_positions = Array ();
 			$config = $this->Application->getUnitConfig($prefix_elements[0]);
 			$config_key_list = $config->getImportKeys();
 
 			if ( !$config_key_list ) {
 				$config_key_list = Array ();
 			}
 
 			$key_list = Array ();
 			array_unshift($config_key_list, Array ($config->getIDField()));
 
 			foreach ($config_key_list as $arr_key => $import_key) {
 				$key_list[$arr_key] = is_array($import_key) ? $import_key : Array ($import_key);
 
 				foreach ($key_list[$arr_key] as $key_field) {
 					$field_positions[$key_field] = array_search($key_field, $import_data['field_list']);
 					if ( $field_positions[$key_field] === false ) {
 						// no such key field combination in imported file
 						unset($key_list[$arr_key]);
 						break;
 					}
 				}
 			}
 
 			$import_data['key_list'] = $key_list;
 			$import_data['field_positions'] = $field_positions;
 
 			$this->Application->StoreVar('import_data', serialize($import_data));
 			return true;
 		}
 
 		/**
 		 * Returns columns of given grid
 		 *
 		 * @param string $prefix
 		 * @param string $grid_name
 		 * @return Array
 		 * @access protected
 		 */
 		protected function _getGridColumns($prefix, $grid_name)
 		{
 			$grid = $this->Application->getUnitConfig($prefix)->getGridByName($grid_name);
 
 			return $grid['Fields'];
 		}
 
 		function ImportStep()
 		{
 			$import_data = unserialize($this->Application->RecallVar('import_data'));
 			$prefix_elems = preg_split('/\.|_/', $import_data['prefix'], 2);
 
+			/** @var kDBItem $object */
 			$object = $this->Application->recallObject($prefix_elems[0].'.-csvimport', $prefix_elems[0], Array('skip_autoload' => true, 'populate_ml_fields' => true));
-			/* @var $object kDBItem */
 
 			$file = fopen($import_data['file'], 'r');
 			$eof = false;
 			// skipping lines that has been already imported
 			for($i = 0; $i < $import_data['lines_processed'] + 1; $i++) {
 				if(feof($file)) break;
 				fgets($file, 8192);
 			}
 
 			$import_event = new kEvent($prefix_elems[0].'.-csvimport:OnBeforeCSVLineImport');
 
 			for($i = 0; $i < $import_data['step']; $i++) {
 				if(feof($file)) break;
 				$data = fgetcsv($file, 8192, $import_data['delimiter'], $import_data['enclosure']);
 				if(!$data) continue;
 
 				$object->Clear();
 				$action = 'Create';
 
 				// 1. trying to load object by keys
 				foreach($import_data['key_list'] as $key) {
 					$fail = false;
 					$key_array = Array();
 					foreach($key as $key_field) {
 						if(!isset($data[ $import_data['field_positions'][$key_field] ])) {
 							$fail = true;
 							break;
 						}
 						$key_array[$key_field] = $data[ $import_data['field_positions'][$key_field] ];
 					}
 					if($fail) continue;
 					if($object->Load($key_array)) {
 						$action = 'Update';
 						break;
 					}
 				}
 
 				// 2. set object fields
 				foreach($import_data['field_list'] as $position => $field_name) {
 					if(isset($data[$position])) {
 						$object->SetField($field_name, $data[$position]);
 					}
 				}
 
 				// 3. validate item and run event
 				$status = $object->Validate();
 				$import_event->status = $status ? kEvent::erSUCCESS : kEvent::erFAIL;
 				$this->Application->HandleEvent($import_event);
 
 				if($import_event->status == kEvent::erSUCCESS && $object->$action()) {
 					$import_data[ ($action == 'Create') ? 'added' : 'updated' ]++;
 				}
 				else {
 					$msg = '';
 					$errors = $object->GetFieldErrors();
 
 					foreach ($errors as $field => $info) {
 						if (!$info['pseudo']) continue;
 						$msg .= "$field: {$info['pseudo']} ";
 					}
 
 					$import_data['errors'] .= ($i + $import_data['lines_processed'] + 1).": $msg\n";
 					$import_data['not_imported_lines'] .= ','.($i + $import_data['lines_processed'] + 1);
 				}
 			}
 
 			$import_data['lines_processed'] += $import_data['step'];
 
 			$import_data['not_imported_lines'] = ltrim($import_data['not_imported_lines'], ',');
 			$this->Application->StoreVar('import_data', serialize($import_data));
 
 			$feof = feof($file);
 			fclose($file);
 
 			if($feof) {
 				$this->Application->Redirect($this->Application->GetVar('finish_template'));
 			}
 			else {
 				$percent_complete = floor($import_data['lines_processed'] / $import_data['total_lines'] * 100);
 				if($percent_complete > 99) $percent_complete = 99;
 				echo $percent_complete;
 			}
 		}
 
 		function ImportData($name)
 		{
 			$import_data = unserialize($this->Application->RecallVar('import_data'));
 			return isset($import_data[$name]) ? $import_data[$name] : false;
 		}
 
 		function GetNotImportedLines()
 		{
 			$import_data = unserialize($this->Application->RecallVar('import_data'));
 
 			if(!$import_data['not_imported_lines']) return false;
 			$line_numbers = explode(',', $import_data['not_imported_lines']);
 			$line_numbers[] = 0; // include header row in output
 
 			$file = fopen($import_data['file'], 'r');
 			$eof = false;
 			$result = '';
 			for($i = 0; $i <= max($line_numbers); $i++) {
 				if(feof($file)) break;
 				$line = fgets($file, 8192);
 				if(in_array($i, $line_numbers)) {
 					$result .= $i.':'.$line;
 				}
 			}
 			return $result."\n\n".$import_data['errors'];
 		}
-	}
\ No newline at end of file
+	}
Index: branches/5.3.x/core/units/helpers/mailbox_helper.php
===================================================================
--- branches/5.3.x/core/units/helpers/mailbox_helper.php	(revision 16518)
+++ branches/5.3.x/core/units/helpers/mailbox_helper.php	(revision 16519)
@@ -1,495 +1,495 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class MailboxHelper extends kHelper {
 
 		var $headers = Array ();
 
 		var $parsedMessage = Array ();
 
 		/**
 		 * Maximal megabytes of data to process
 		 *
 		 * @var int
 		 */
 		var $maxMegabytes = 2;
 
 		/**
 		 * Maximal message count to process
 		 *
 		 * @var int
 		 */
 		var $maxMessages = 50;
 
 		/**
 		 * Reads mailbox and gives messages to processing callback
 		 *
 		 * @param Array $connection_info
 		 * @param Array $verify_callback
 		 * @param Array $process_callback
 		 * @param Array $callback_params
 		 * @param bool $include_attachment_contents
 		 * @return string
 		 */
 		function process($connection_info, $verify_callback, $process_callback, $callback_params = Array (), $include_attachment_contents = true)
 		{
+			/** @var POP3Helper $pop3_helper */
 			$pop3_helper = $this->Application->makeClass('POP3Helper', Array ($connection_info));
-			/* @var $pop3_helper POP3Helper */
 
 			$connection_status = $pop3_helper->initMailbox();
 
 			if (is_string($connection_status)) {
 				return $connection_status;
 			}
 
 			if (defined('DEBUG_MODE') && DEBUG_MODE && $this->Application->isDebugMode()) {
 				$this->Application->Debugger->appendHTML('Reading MAILBOX: ' . $connection_info['username']);
 			}
 
 			// Figure out if all messages are huge
 			$only_big_messages = true;
 			$max_message_size = $this->maxMegabytes * (1024 * 1024);
 
 			foreach ($pop3_helper->messageSizes as $message_size) {
 				if (($message_size <= $max_message_size) && ($max_message_size > 0)) {
 					$only_big_messages = false;
 					break;
 				}
 			}
 
 			$count = $total_size = 0;
 
 			foreach ($pop3_helper->messageSizes as $message_number => $message_size) {
 				// Too many messages?
 				if (($count++ > $this->maxMessages) && ($this->maxMessages > 0)) {
 					break;
 				}
 
 				// Message too big?
 				if (!$only_big_messages && ($message_size > $max_message_size) && ($max_message_size > 0)) {
 					$this->_displayLogMessage('message <strong>#' . $message_number . '</strong> too big, skipped');
 					continue;
 				}
 
 				// Processed enough for today?
 				if (($total_size > $max_message_size) && ($max_message_size > 0)) {
 					break;
 				}
 
 				$total_size += $message_size;
 				$pop3_helper->getEmail($message_number, $message_source);
 
 				$processed = $this->normalize($message_source, $verify_callback, $process_callback, $callback_params, $include_attachment_contents);
 
 				if ($processed) {
 					// delete message from server immediatly after retrieving & processing
 					$pop3_helper->deleteEmail($message_number);
 					$this->_displayLogMessage('message <strong>#' . $message_number . '</strong>: processed');
 				}
 				else {
 					$this->_displayLogMessage('message <strong>#' . $message_number . '</strong>: skipped');
 				}
 			}
 
 			$pop3_helper->close();
 
 			return 'success';
 		}
 
 		/**
 		 * Displays log message
 		 *
 		 * @param string $text
 		 */
 		function _displayLogMessage($text)
 		{
 			if (defined('DEBUG_MODE') && DEBUG_MODE && $this->Application->isDebugMode()) {
 				$this->Application->Debugger->appendHTML($text);
 			}
 		}
 
 		/**
 		 * Takes an RFC822 formatted date, returns a unix timestamp (allowing for zone)
 		 *
 		 * @param string $rfcdate
 		 * @return int
 		 */
 		function rfcToTime($rfcdate)
 		{
 			$date = strtotime($rfcdate);
 
 			if ($date == -1) {
 				return false;
 			}
 
 			return $date;
 		}
 
 		/**
 		 * Gets recipients from all possible headers
 		 *
 		 * @return string
 		 */
 		function getRecipients()
 		{
 			$ret = '';
 
 			// headers that could contain recipients
 			$recipient_headers = Array (
 				'to', 'cc', 'envelope-to', 'resent-to', 'delivered-to',
 				'apparently-to', 'envelope-to', 'x-envelope-to', 'received',
 			);
 
 			foreach ($recipient_headers as $recipient_header) {
 				if (!array_key_exists($recipient_header, $this->headers)) {
 					continue;
 				}
 
 				if (!is_array($this->headers["$recipient_header"])) {
 					$ret .= ' ' . $this->headers["$recipient_header"];
 				} else {
 					$ret .= ' ' . implode(' ', $this->headers["$recipient_header"]);
 				}
 			}
 
 			return $ret;
 		}
 
 		/**
 		 * "Flattens" the multi-demensinal headers array into a single dimension one
 		 *
 		 * @param Array $input
 		 * @param string $add
 		 * @return Array
 		 */
 		function flattenHeadersArray($input, $add = '')
 		{
 			$output = Array ();
 
 			foreach ($input as $key => $value) {
 				if (!empty($add)) {
 					$newkey = ucfirst( strtolower($add) );
 				} elseif (is_numeric($key)) {
 					$newkey = '';
 				} else {
 					$newkey = ucfirst( strtolower($key) );
 				}
 
 				if (is_array($value)) {
 					$output = array_merge($output, $this->flattenHeadersArray($value, $newkey));
 				} else {
 					$output[] = (!empty($newkey) ? $newkey . ': ' : '') . $value;
 				}
 			}
 
 			return $output;
 		}
 
 		/**
 		 * Processes given message using given callbacks
 		 *
 		 * @param string $message
 		 * @param Array $verify_callback
 		 * @param Array $process_callback
 		 * @param Array $callback_params
 		 * @param bool $include_attachment_contents
 		 * @return bool
 		 * @access protected
 		 */
 		protected function normalize($message, $verify_callback, $process_callback, $callback_params, $include_attachment_contents = true)
 		{
 			// Decode message
 			$this->decodeMime($message, $include_attachment_contents);
 
 			// Init vars; $good will hold all the correct infomation from now on
 			$good = Array ();
 
 			// trim() some stuff now instead of later
 			$this->headers['from'] = trim($this->headers['from']);
 			$this->headers['to'] = trim($this->headers['to']);
 			$this->headers['cc'] = array_key_exists('cc', $this->headers) ? trim($this->headers['cc']) : '';
 			$this->headers['x-forward-to'] = array_key_exists('x-forward-to', $this->headers) ? $this->headers['x-forward-to'] : '';
 			$this->headers['subject'] = trim($this->headers['subject']);
 			$this->headers['received'] = is_array($this->headers['received']) ? $this->headers['received'] : Array ($this->headers['received']);
 
 			if (array_key_exists('return-path', $this->headers) && is_array($this->headers['return-path'])) {
 				$this->headers['return-path'] = implode(' ', $this->flattenHeadersArray($this->headers['return-path']));
 			}
 
 			// Create our own message-ID if it's missing
 			$message_id = array_key_exists('message-id', $this->headers) ? trim($this->headers['message-id']) : '';
 			$good['emailid'] = $message_id ? $message_id : md5($message) . "@in-portal";
 
 			// Stops us looping in stupid conversations with other mail software
 			if (isset($this->headers['x-loop-detect']) && $this->headers['x-loop-detect'] > 2) {
 				return false;
 			}
 
+			/** @var kEmailSendingHelper $esender */
 			$esender = $this->Application->recallObject('EmailSender');
-			/* @var $esender kEmailSendingHelper */
 
 			// Get the return address
 			$return_path = '';
 
 			if (array_key_exists('return-path', $this->headers)) {
 				$return_path = $esender->ExtractRecipientEmail($this->headers['return-path']);
 			}
 
 			if (!$return_path) {
 				if (array_key_exists('reply-to', $this->headers)) {
 					$return_path = $esender->ExtractRecipientEmail( $this->headers['reply-to'] );
 				}
 				else {
 					$return_path = $esender->ExtractRecipientEmail( $this->headers['from'] );
 				}
 			}
 
 			// Get the sender's name & email
 			$good['fromemail'] = $esender->ExtractRecipientEmail($this->headers['from']);
 			$good['fromname'] = $esender->ExtractRecipientName($this->headers['from'], $good['fromemail']);
 
 			// Get the list of recipients.
 			if ( !call_user_func($verify_callback, $callback_params) ) {
 				// Error: mail is probably spam.
 				return false;
 			}
 
 			// Handle the subject
 			$good['subject'] = $this->headers['subject'];
 
 			// Priorities rock
 			$good['priority'] = array_key_exists('x-priority', $this->headers) ? (int)$this->headers['x-priority'] : 0;
 
 			switch ($good['priority']) {
 				case 1: case 5: break;
 				default:
 					$good['priority'] = 3;
 			}
 
 			// If we have attachments it's about time we tell the user about it
 			if (array_key_exists('attachments', $this->parsedMessage) && is_array($this->parsedMessage['attachments'])) {
 				$good['attach'] = count( $this->parsedMessage['attachments'] );
 			} else {
 				$good['attach'] = 0;
 			}
 
 			// prepare message text (for replies, etc)
 			if (isset($this->parsedMessage['text'][0]) && trim($this->parsedMessage['text'][0]['body']) != '') {
 				$message_body = trim($this->parsedMessage['text'][0]['body']);
 				$message_type = 'text';
 			} elseif (isset($this->parsedMessage['html']) && trim($this->parsedMessage['html'][0]['body']) != '') {
 				$message_body = trim($this->parsedMessage['html'][0]['body']);
 				$message_type = 'html';
 			} else {
 				$message_body = '[no message]';
 				$message_type = 'text';
 			}
 
 			// remove scripts
 			$message_body = preg_replace("/<script[^>]*>[^<]+<\/script[^>]*>/is", '', $message_body);
 			$message_body = preg_replace("/<iframe[^>]*>[^<]*<\/iframe[^>]*>/is", '', $message_body);
 
 			if ($message_type == 'html') {
 				$message_body = $esender->ConvertToText($message_body);
 			}
 
+			/** @var MimeDecodeHelper $mime_decode_helper */
 			$mime_decode_helper = $this->Application->recallObject('MimeDecodeHelper');
-			/* @var $mime_decode_helper MimeDecodeHelper */
 
 			// convert to site encoding
 			$message_charset = $this->parsedMessage[$message_type][0]['charset'];
 
 			if ($message_charset) {
 				$good['message'] = $mime_decode_helper->convertEncoding($message_charset, $message_body);
 			}
 
 			if (array_key_exists('delivery-date', $this->headers)) {
 				// We found the Delivery-Date header (and it's not too far in the future)
 				$dateline = $this->rfcToTime($this->headers['delivery-date']);
 
 				if ($dateline > TIMENOW + 86400) {
 					unset($dateline);
 				}
 			}
 
 			// We found the latest date from the received headers
 			$received_timestamp = $this->headers['received'][0];
 			$dateline = $this->rfcToTime(trim( substr($received_timestamp, strrpos($received_timestamp, ';') + 1) ));
 
 			if ($dateline == $this->rfcToTime(0)) {
 				unset($dateline);
 			}
 
 			if (!isset($dateline)) {
 				$dateline = TIMENOW;
 			}
 
 			// save collected data to database
 			$fields_hash = Array (
 				'DeliveryDate' 		=> $dateline, // date, when SMTP server received the message
 				'ReceivedDate' 		=> TIMENOW, // date, when message was retrieved from POP3 server
 				'CreatedOn' 		=> $this->rfcToTime($this->headers['date']), // date, when created on sender's computer
 				'ReturnPath'		=> $return_path,
 				'FromEmail'			=> $good['fromemail'],
 				'FromName'			=> $good['fromname'],
 				'To'				=> $this->headers['to'],
 				'Subject'			=> $good['subject'],
 				'Message'			=> $good['message'],
 				'MessageType'		=> $message_type,
 				'AttachmentCount'	=> $good['attach'],
 				'MessageId'			=> $good['emailid'],
 				'Source'			=> $message,
 				'Priority'			=> $good['priority'],
 				'Size'				=> strlen($message),
 			);
 
 			return call_user_func($process_callback, $callback_params, $fields_hash);
 		}
 
 		/**
 		 * Function that decodes the MIME message and creates the $this->headers and $this->parsedMessage data arrays
 		 *
 		 * @param string $message
 		 * @param bool $include_attachments
 		 *
 		 */
 		function decodeMime($message, $include_attachments = true)
 		{
 			$message = preg_replace("/\r?\n/", "\r\n", trim($message));
 
+			/** @var MimeDecodeHelper $mime_decode_helper */
 			$mime_decode_helper = $this->Application->recallObject('MimeDecodeHelper');
-			/* @var $mime_decode_helper MimeDecodeHelper */
 
 			// 1. separate headers from bodies
 			$mime_decode_helper->InitHelper($message);
 			$decoded_message = $mime_decode_helper->decode(true, true, true);
 
 			// 2. extract attachments
 			$this->parsedMessage = Array (); // ! reset value
 			$this->parseOutput($decoded_message, $this->parsedMessage, $include_attachments);
 
 			// 3. add "other" attachments (text part, that is not maked as attachment)
 			if (array_key_exists('text', $this->parsedMessage) && count($this->parsedMessage['text']) > 1) {
 				for ($attach = 1; $attach < count($this->parsedMessage['text']); $attach++) {
 					$this->parsedMessage['attachments'][] = Array (
 						'data' => $this->parsedMessage['text']["$attach"]['body'],
 					);
 				}
 			}
 
 			$this->headers = $this->parsedMessage['headers']; // ! reset value
 
 			if (empty($decoded_message->ctype_parameters['boundary'])) {
 				// when no boundary, then assume all message is it's text
 				$this->parsedMessage['text'][0]['body'] = $decoded_message->body;
 			}
 		}
 
 		/**
 		 * Returns content-id's from inline attachments in message
 		 *
 		 * @return Array
 		 */
 		function getContentIds()
 		{
 			$cids = Array();
 
 			if (array_key_exists('attachments', $this->parsedMessage) && is_array($this->parsedMessage['attachments'])) {
 				foreach ($this->parsedMessage['attachments'] as $attachnum => $attachment) {
 					if (!isset($attachment['headers']['content-id'])) {
 						continue;
 					}
 
 					$cid = $attachment['headers']['content-id'];
 
 					if (substr($cid, 0, 1) == '<' && substr($cid, -1) == '>') {
 						$cid = substr($cid, 1, -1);
 					}
 
 					$cids["$attachnum"] = $cid;
 				}
 			}
 
 			return $cids;
 		}
 
 		/**
 		 * Get more detailed information about attachments
 		 *
 		 * @param stdClass $decoded parsed headers & body as object
 		 * @param Array $parts parsed parts
 		 * @param bool $include_attachments
 		 */
 		function parseOutput(&$decoded, &$parts, $include_attachments = true)
 		{
 			$ctype = strtolower($decoded->ctype_primary . '/' . $decoded->ctype_secondary);
 
 			// don't parse attached messages recursevely
 			if (!empty($decoded->parts) && $ctype != 'message/rfc822') {
 				for ($i = 0; $i < count($decoded->parts); $i++) {
 					$this->parseOutput($decoded->parts["$i"], $parts, $include_attachments);
 				}
 			} else/*if (!empty($decoded->disposition) && $decoded->disposition != 'inline' or 1)*/ {
 				switch ($ctype) {
 					case 'text/plain':
 					case 'text/html':
 						if (!empty($decoded->disposition) && ($decoded->disposition == 'attachment')) {
 							$parts['attachments'][] = Array (
 								'data' => $include_attachments ? $decoded->body : '',
 								'filename' => array_key_exists('filename', $decoded->d_parameters) ? $decoded->d_parameters['filename'] : '', // from content-disposition
 								'filename2' => $decoded->ctype_parameters['name'], // from content-type
 								'type' => $decoded->ctype_primary, // "text"
 								'encoding' => $decoded->headers['content-transfer-encoding']
 							);
 						} else {
 							$body_type = $decoded->ctype_secondary == 'plain' ? 'text' : 'html';
 							$parts[$body_type][] = Array (
 								'content-type' => $ctype,
 								'charset' => array_key_exists('charset', $decoded->ctype_parameters) ? $decoded->ctype_parameters['charset'] : 'ISO-8859-1',
 								'body' => $decoded->body
 							);
 						}
 						break;
 
 					case 'message/rfc822':
 						// another e-mail as attachment
 						$parts['attachments'][] = Array (
 							'data' => $include_attachments ? $decoded->body : '',
 							'filename' => array_key_exists('filename', $decoded->d_parameters) ? $decoded->d_parameters['filename'] : '',
 							'filename2' => array_key_exists('name', $decoded->ctype_parameters) ? $decoded->ctype_parameters['name'] : $decoded->parts[0]->headers['subject'],
 							'type' => $decoded->ctype_primary, // "message"
 							'headers' => $decoded->headers // individual copy of headers with each attachment
 						);
 						break;
 
 					default:
 						if (!stristr($decoded->headers['content-type'], 'signature')) {
 							$parts['attachments'][] = Array (
 								'data' => $include_attachments ? $decoded->body : '',
 								'filename' => array_key_exists('filename', $decoded->d_parameters) ? $decoded->d_parameters['filename'] : '', // from content-disposition
 								'filename2' => $decoded->ctype_parameters['name'], // from content-type
 								'type' => $decoded->ctype_primary,
 								'headers' => $decoded->headers // individual copy of headers with each attachment
 							);
 						}
 
 				}
 			}
 
 			$parts['headers'] = $decoded->headers; // headers of next parts overwrite previous part headers
 		}
 
 	}
Index: branches/5.3.x/core/units/helpers/cat_dbitem_export_helper.php
===================================================================
--- branches/5.3.x/core/units/helpers/cat_dbitem_export_helper.php	(revision 16518)
+++ branches/5.3.x/core/units/helpers/cat_dbitem_export_helper.php	(revision 16519)
@@ -1,1587 +1,1587 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	define('EXPORT_STEP', 100); // export by 200 items (e.g. links)
 	define('IMPORT_STEP', 20); // export by 200 items (e.g. links)
 	define('IMPORT_CHUNK', 10240); // 10240); //30720); //50120); // 5 KB
 
 	define('IMPORT_TEMP', 1);
 	define('IMPORT_LIVE', 2);
 
 	class kCatDBItemExportHelper extends kHelper {
 
 		var $false = false;
 
 		var $cache = Array();
 
 		/**
 		 * Allows to find out what items are new in cache
 		 *
 		 * @var Array
 		 */
 		var $cacheStatus = Array();
 
 		var $cacheTable = '';
 
 		var $exportFields = Array();
 
 		/**
 		 * Export options
 		 *
 		 * @var Array
 		 */
 		var $exportOptions = Array();
 
 		/**
 		 * Item being currently exported
 		 *
 		 * @var kCatDBItem
 		 */
 		var $curItem = null;
 
 		/**
 		 * Dummy category object
 		 *
 		 * @var CategoriesItem
 		 */
 		var $dummyCategory = null;
 
 		/**
 		 * Pointer to opened file
 		 *
 		 * @var resource
 		 */
 		var $filePointer = null;
 
 		/**
 		 * Custom fields definition of current item
 		 *
 		 * @var Array
 		 */
 		var $customFields = Array();
 
 		public function __construct()
 		{
 			parent::__construct();
 
 			$this->cacheTable = TABLE_PREFIX.'ImportCache';
 		}
 
 		/**
 		 * Returns value from cache if found or false otherwise
 		 *
 		 * @param string $type
 		 * @param int $key
 		 * @return mixed
 		 */
 		function getFromCache($type, $key)
 		{
 			return getArrayValue($this->cache, $type, $key);
 		}
 
 		/**
 		 * Adds value to be cached
 		 *
 		 * @param string $type
 		 * @param int $key
 		 * @param mixed $value
 		 * @param bool $is_new
 		 */
 		function addToCache($type, $key, $value, $is_new = true)
 		{
 			/*if ( !isset($this->cache[$type]) ) {
 				$this->cache[$type] = Array ();
 			}*/
 
 			$this->cache[$type][$key] = $value;
 
 			if ( $is_new ) {
 				$this->cacheStatus[$type][$key] = true;
 			}
 		}
 
 		function storeCache($cache_types)
 		{
 			$fields_hash = Array ();
 			$cache_types = explode(',', $cache_types);
 
 			foreach ($cache_types as $cache_type) {
 				$fields_hash = Array ('CacheName' => $cache_type);
 				$cache = getArrayValue($this->cacheStatus, $cache_type);
 
 				if ( !$cache ) {
 					$cache = Array ();
 				}
 
 				foreach ($cache as $var_name => $cache_status) {
 					$fields_hash['VarName'] = $var_name;
 					$fields_hash['VarValue'] = $this->cache[$cache_type][$var_name];
 
 					$this->Conn->doInsert($fields_hash, $this->cacheTable, 'INSERT', false);
 				}
 			}
 
 			if ( isset($fields_hash['VarName']) ) {
 				$this->Conn->doInsert($fields_hash, $this->cacheTable, 'INSERT');
 			}
 		}
 
 		function loadCache()
 		{
 			$this->cache = Array ();
 
 			$sql = 'SELECT *
 					FROM ' . $this->cacheTable;
 			$records = $this->Conn->GetIterator($sql);
 
 			foreach ($records as $record) {
 				$this->addToCache($record['CacheName'], $record['VarName'], $record['VarValue'], false);
 			}
 		}
 
 		/**
 		 * Fill required fields with dummy values
 		 *
 		 * @param kEvent|bool $event
 		 * @param kCatDBItem|bool $object
 		 * @param bool $set_status
 		 */
 		function fillRequiredFields($event, &$object, $set_status = false)
 		{
 			if ( $object == $this->false ) {
+				/** @var kCatDBItem $object */
 				$object = $event->getObject();
-				/* @var $object kCatDBItem */
 			}
 
 			$has_empty = false;
 			$fields = $object->getFields();
 
 			if ( $object->isField('CreatedById') ) {
 				// CSV file was created without required CreatedById column
 				if ( $object->isRequired('CreatedById') ) {
 					$object->setRequired('CreatedById', false);
 				}
 
 				if ( !is_numeric( $object->GetDBField('CreatedById') ) ) {
 					$object->SetDBField('CreatedById', $this->Application->RecallVar('user_id'));
 				}
 			}
 
 			foreach ($fields as $field_name => $field_options) {
 				if ( $object->isVirtualField($field_name) || !$object->isRequired($field_name) ) {
 					continue;
 				}
 
 				if ( $object->GetDBField($field_name) ) {
 					continue;
 				}
 
 				$formatter_class = getArrayValue($field_options, 'formatter');
 
 				if ( $formatter_class ) {
 					// not tested
+					/** @var kFormatter $formatter */
 					$formatter = $this->Application->recallObject($formatter_class);
-					/* @var $formatter kFormatter */
 
 					$sample_value = $formatter->GetSample($field_name, $field_options, $object);
 				}
 
 				$has_empty = true;
 				$object->SetField($field_name, isset($sample_value) && $sample_value ? $sample_value : 'no value');
 			}
 			$object->UpdateFormattersSubFields();
 
 			if ( $set_status && $has_empty ) {
 				$object->SetDBField('Status', 0);
 			}
 		}
 
 		/**
 		 * Verifies that all user entered export params are correct
 		 *
 		 * @param kEvent $event
 		 * @return bool
 		 * @access protected
 		 */
 		protected function verifyOptions($event)
 		{
 			if ($this->Application->RecallVar($event->getPrefixSpecial().'_ForceNotValid'))
 			{
 				$this->Application->StoreVar($event->getPrefixSpecial().'_ForceNotValid', 0);
 				return false;
 			}
 
 			$this->fillRequiredFields($event, $this->false);
 
+			/** @var kCatDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kCatDBItem */
 
 			$cross_unique_fields = Array('FieldsSeparatedBy', 'FieldsEnclosedBy');
 			if (($object->GetDBField('CategoryFormat') == 1) || ($event->Special == 'import')) // in one field
 			{
 				$object->setRequired('CategorySeparator');
 				$cross_unique_fields[] = 'CategorySeparator';
 			}
 
 			$ret = $object->Validate();
 
 			// check if cross unique fields has no same values
 			foreach ($cross_unique_fields as $field_index => $field_name)
 			{
 				if ($object->GetErrorPseudo($field_name) == 'required') {
 					continue;
 				}
 
 				$check_fields = $cross_unique_fields;
 				unset($check_fields[$field_index]);
 
 				foreach ($check_fields as $check_field)
 				{
 					if ($object->GetDBField($field_name) == $object->GetDBField($check_field))
 					{
 						$object->SetError($check_field, 'unique');
 					}
 				}
 			}
 
 			if ($event->Special == 'import')
 			{
 				$this->exportOptions = $this->loadOptions($event);
 
 				$automatic_fields = ($object->GetDBField('FieldTitles') == 1);
 				$object->setRequired('ExportColumns', !$automatic_fields);
 				$category_prefix = '__CATEGORY__';
 				if ( $automatic_fields && ($this->exportOptions['SkipFirstRow']) ) {
 					$this->openFile($event);
 					$this->exportOptions['ExportColumns'] = $this->readRecord();
 
 					if (!$this->exportOptions['ExportColumns']) {
 						$this->exportOptions['ExportColumns'] = Array ();
 					}
 
 					$this->closeFile();
 
 					// remove additional (non-parseble columns)
 					foreach ($this->exportOptions['ExportColumns'] as $field_index => $field_name) {
 						if (!$this->validateField($field_name, $object)) {
 							unset($this->exportOptions['ExportColumns'][$field_index]);
 						}
 					}
 					$category_prefix = '';
 				}
 
 				// 1. check, that we have column definitions
 				if (!$this->exportOptions['ExportColumns']) {
 					$object->setError('ExportColumns', 'required');
 					$ret = false;
 				}
 				else {
 					// 1.1. check that all required fields are present in imported file
 					$missing_columns = Array();
 					$fields = $object->getFields();
 
 					foreach ($fields as $field_name => $field_options) {
 						if ($object->skipField($field_name)) continue;
 						if ( $object->isRequired($field_name) && !in_array($field_name, $this->exportOptions['ExportColumns']) ) {
 							$missing_columns[] = $field_name;
 							$object->setError('ExportColumns', 'required_fields_missing', 'la_error_RequiredColumnsMissing');
 							$ret = false;
 						}
 					}
 
 					if (!$ret && $this->Application->isDebugMode()) {
 						$this->Application->Debugger->appendHTML('Missing required for import/export:');
 						$this->Application->Debugger->dumpVars($missing_columns);
 					}
 				}
 
 
 				// 2. check, that we have only mixed category field or only separated category fields
 				$category_found['mixed'] = false;
 				$category_found['separated'] = false;
 
 				foreach ($this->exportOptions['ExportColumns'] as $import_field) {
 					if (preg_match('/^'.$category_prefix.'Category(Path|[0-9]+)/', $import_field, $rets)) {
 						$category_found[$rets[1] == 'Path' ? 'mixed' : 'separated'] = true;
 					}
 				}
 				if ($category_found['mixed'] && $category_found['separated']) {
 					$object->SetError('ExportColumns', 'unique_category', 'la_error_unique_category_field');
 					$ret = false;
 				}
 
 				// 3. check, that duplicates check fields are selected & present in imported fields
 				if ($this->exportOptions['ReplaceDuplicates']) {
 					if ($this->exportOptions['CheckDuplicatesMethod'] == 1) {
 						$check_fields = Array($object->IDField);
 					}
 					else {
 						$check_fields = $this->exportOptions['DuplicateCheckFields'] ? explode('|', substr($this->exportOptions['DuplicateCheckFields'], 1, -1)) : Array();
 						$object = $event->getObject();
 
 						$fields = $object->getFields();
 						$language_id = $this->Application->GetDefaultLanguageId();
 
 						foreach ($check_fields as $index => $check_field) {
 							foreach ($fields as $field_name => $field_options) {
 								if ($field_name == 'l'.$language_id.'_'.$check_field) {
 									$check_fields[$index] = 'l'.$language_id.'_'.$check_field;
 									break;
 								}
 							}
 						}
 					}
 					$this->exportOptions['DuplicateCheckFields'] = $check_fields;
 
 					if (!$check_fields) {
 						$object->setError('CheckDuplicatesMethod', 'required');
 						$ret = false;
 					}
 					else {
 						foreach ($check_fields as $check_field) {
 							$check_field = preg_replace('/^cust_(.*)/', 'Custom_\\1', $check_field);
 							if (!in_array($check_field, $this->exportOptions['ExportColumns'])) {
 								$object->setError('ExportColumns', 'required');
 								$ret = false;
 								break;
 							}
 						}
 					}
 				}
 				$this->saveOptions($event);
 			}
 
 			return $ret;
 		}
 
 		/**
 		 * Returns filename to read import data from
 		 *
 		 * @return string
 		 */
 		function getImportFilename()
 		{
 			if ($this->exportOptions['ImportSource'] == 1)
 			{
 				$ret = $this->exportOptions['ImportFilename']; // ['name']; commented by Kostja
 			}
 			else {
 				$ret = $this->exportOptions['ImportLocalFilename'];
 			}
 			return EXPORT_PATH.'/'.$ret;
 		}
 
 		/**
 		 * Returns filename to write export data to
 		 *
 		 * @return string
 		 */
 		function getExportFilename()
 		{
 			$extension = $this->getFileExtension();
 			$filename = preg_replace('/(.*)\.' . $extension . '$/', '\1', $this->exportOptions['ExportFilename']) . '.' . $extension;
 
 			return EXPORT_PATH . DIRECTORY_SEPARATOR . $filename;
 		}
 
 		/**
 		 * Opens file required for export/import operations
 		 *
 		 * @param kEvent $event
 		 */
 		function openFile($event)
 		{
+			/** @var FileHelper $file_helper */
 			$file_helper = $this->Application->recallObject('FileHelper');
-			/* @var $file_helper FileHelper */
 
 			$file_helper->CheckFolder(EXPORT_PATH);
 
 			if ( $event->Special == 'export' ) {
 				$first_step = $this->exportOptions['start_from'] == 0;
 				$this->filePointer = fopen($this->getExportFilename(), $first_step ? 'w' : 'r+');
 
 				if ( !$first_step ) {
 					fseek($this->filePointer, 0, SEEK_END);
 				}
 			}
 			else {
 				$this->filePointer = fopen($this->getImportFilename(), 'r');
 
 				// skip UTF-8 BOM Modifier
 				$first_chars = fread($this->filePointer, 3);
 				if ( bin2hex($first_chars) != 'efbbbf' ) {
 					fseek($this->filePointer, 0);
 				}
 			}
 		}
 
 		/**
 		 * Closes opened file
 		 *
 		 */
 		function closeFile()
 		{
 			fclose($this->filePointer);
 		}
 
 		function getCustomSQL()
 		{
+			/** @var kMultiLanguage $ml_formatter */
 			$ml_formatter = $this->Application->recallObject('kMultiLanguage');
-			/* @var $ml_formatter kMultiLanguage */
 
 			$custom_sql = '';
 
 			foreach ($this->customFields as $custom_id => $custom_name) {
 				$custom_sql .= 'custom_data.' . $ml_formatter->LangFieldName('cust_' . $custom_id) . ' AS cust_' . $custom_name . ', ';
 			}
 
 			return substr($custom_sql, 0, -2);
 		}
 
 		function getPlainExportSQL($count_only = false)
 		{
 			if ( $count_only && isset($this->exportOptions['ForceCountSQL']) ) {
 				$sql = $this->exportOptions['ForceCountSQL'];
 			}
 			elseif ( !$count_only && isset($this->exportOptions['ForceSelectSQL']) ) {
 				$sql = $this->exportOptions['ForceSelectSQL'];
 			}
 			else {
 				/** @var kDBList $items_list */
 				$items_list = $this->Application->recallObject(
 					$this->curItem->Prefix . '.' . $this->exportOptions['export_special'],
 					$this->curItem->Prefix . '_List',
 					array('grid' => $this->exportOptions['export_grid'])
 				);
 
 				$items_list->SetPerPage(-1);
 
 				if ( $this->exportOptions['export_ids'] != '' ) {
 					$items_list->addFilter('export_ids', $items_list->TableName . '.' . $items_list->IDField . ' IN (' . implode(',', $this->exportOptions['export_ids']) . ')');
 				}
 
 				if ( $count_only ) {
 					$sql = $items_list->getCountSQL($items_list->GetSelectSQL(true, false));
 				}
 				else {
 					$sql = $items_list->GetSelectSQL();
 				}
 			}
 
 			if ( !$count_only ) {
 				$sql .= ' LIMIT ' . $this->exportOptions['start_from'] . ',' . EXPORT_STEP;
 			}
 			/*else {
 				$sql = preg_replace("/^\s*SELECT(.*?\s)FROM(?!_)/is", "SELECT COUNT(*) AS count FROM ", $sql);
 			}*/
 
 			return $sql;
 		}
 
 		function getExportSQL($count_only = false)
 		{
 			if ( !$this->curItem->getUnitConfig()->getCatalogItem() ) {
 				return $this->GetPlainExportSQL($count_only); // in case this is not a CategoryItem
 			}
 
 			if ( $this->exportOptions['export_ids'] === false ) {
 				// get links from current category & all it's subcategories
 				$join_clauses = Array ();
 
 				$custom_sql = $this->getCustomSQL();
 
 				if ( $custom_sql ) {
 					$custom_table = $this->Application->getUnitConfig($this->curItem->Prefix . '-cdata')->getTableName();
 					$join_clauses[$custom_table . ' custom_data'] = 'custom_data.ResourceId = item_table.ResourceId';
 				}
 
 				$join_clauses[TABLE_PREFIX . 'CategoryItems ci'] = 'ci.ItemResourceId = item_table.ResourceId';
 				$join_clauses[TABLE_PREFIX . 'Categories c'] = 'c.CategoryId = ci.CategoryId';
 
 				$sql = 'SELECT item_table.*, ci.CategoryId' . ($custom_sql ? ', ' . $custom_sql : '') . '
 						FROM ' . $this->curItem->TableName . ' item_table';
 
 				foreach ($join_clauses as $table_name => $join_expression) {
 					$sql .= ' LEFT JOIN ' . $table_name . ' ON ' . $join_expression;
 				}
 
 				$sql .= ' WHERE ';
 
 				if ( $this->exportOptions['export_cats_ids'][0] == 0 ) {
 					$sql .= '1';
 				}
 				else {
 					foreach ($this->exportOptions['export_cats_ids'] as $category_id) {
 						$sql .= '(c.ParentPath LIKE "%|' . $category_id . '|%") OR ';
 					}
 
 					$sql = substr($sql, 0, -4);
 				}
 
 				$sql .= ' ORDER BY ci.PrimaryCat DESC, c.TreeLeft ASC, item_table.' . $this->curItem->IDField . ' ASC';
 			}
 			else {
 				// get only selected links
 				$sql = 'SELECT item_table.*, ' . $this->exportOptions['export_cats_ids'][0] . ' AS CategoryId
 						FROM ' . $this->curItem->TableName . ' item_table
 						WHERE ' . $this->curItem->IDField . ' IN (' . implode(',', $this->exportOptions['export_ids']) . ')';
 			}
 
 			if ( !$count_only ) {
 				$sql .= ' LIMIT ' . $this->exportOptions['start_from'] . ',' . EXPORT_STEP;
 			}
 			else {
 				$sql = preg_replace("/^\s*SELECT(.*?\s)FROM(?!_)/is", "SELECT COUNT(*) AS count FROM ", $sql);
 			}
 
 			return $sql;
 		}
 
 		/**
 		 * Enter description here...
 		 *
 		 * @param kEvent $event
 		 */
 		function performExport($event)
 		{
 			$this->exportOptions = $this->loadOptions($event);
 			$this->exportFields = $this->exportOptions['ExportColumns'];
 			$this->curItem = $event->getObject(Array ('skip_autoload' => true));
 			$this->customFields = $event->getUnitConfig()->getCustomFields();
 			$this->openFile($event);
 
 			if ( $this->exportOptions['start_from'] == 0 ) {
 				// first export step
 				if ( !getArrayValue($this->exportOptions, 'IsBaseCategory') ) {
 					$this->exportOptions['IsBaseCategory'] = 0;
 				}
 
 				if ( $this->exportOptions['IsBaseCategory'] ) {
 					$sql = 'SELECT ParentPath
 							FROM ' . TABLE_PREFIX . 'Categories
 							WHERE CategoryId = ' . (int)$this->Application->GetVar('m_cat_id');
 					$parent_path = $this->Conn->GetOne($sql);
 					$parent_path = explode('|', substr($parent_path, 1, -1));
 
 					if ( $parent_path && $parent_path[0] == $this->Application->getBaseCategory() ) {
 						array_shift($parent_path);
 					}
 
 					$this->exportOptions['BaseLevel'] = count($parent_path); // level to cut from other categories
 				}
 
 				// 1. export field titles if required
 				if ( $this->exportOptions['IncludeFieldTitles'] ) {
 					$data_array = Array ();
 					foreach ($this->exportFields as $export_field) {
 						$data_array = array_merge($data_array, $this->getFieldCaption($export_field));
 					}
 					$this->writeRecord($data_array);
 				}
 
 				$this->exportOptions['total_records'] = $this->Conn->GetOne($this->getExportSQL(true));
 			}
 
 			// 2. export data
 			$records = $this->Conn->Query( $this->getExportSQL() );
 			$records_exported = 0;
 			foreach ($records as $record_info) {
 				$this->curItem->LoadFromHash($record_info);
 
 				$data_array = Array();
 				foreach ($this->exportFields as $export_field)
 				{
 					$data_array = array_merge($data_array, $this->getFieldValue($export_field) );
 				}
 				$this->writeRecord($data_array);
 				$records_exported++;
 			}
 			$this->closeFile();
 
 			$this->exportOptions['start_from'] += $records_exported;
 			$this->saveOptions($event);
 
 			return $this->exportOptions;
 		}
 
 		function getItemFields()
 		{
 			// just in case dummy user selected automtic mode & moved columns too :(
 			$src_options = $this->curItem->GetFieldOption('ExportColumns', 'options');
 			$dst_options = $this->curItem->GetFieldOption('AvailableColumns', 'options');
 
 			return array_merge($dst_options, $src_options);
 		}
 
 		/**
 		 * Checks if field really belongs to importable field list
 		 *
 		 * @param string $field_name
 		 * @param kCatDBItem $object
 		 * @return bool
 		 */
 		function validateField($field_name, &$object)
 		{
 			// 1. convert custom field
 			$field_name = preg_replace('/^Custom_(.*)/', '__CUSTOM__\\1', $field_name);
 
 			// 2. convert category field (mixed version & separated version)
 			$field_name = preg_replace('/^Category(Path|[0-9]+)/', '__CATEGORY__Category\\1', $field_name);
 
 			$valid_fields = $object->getPossibleExportColumns();
 			return isset($valid_fields[$field_name]) || isset($valid_fields['__VIRTUAL__'.$field_name]);
 		}
 
 		/**
 		 * Enter description here...
 		 *
 		 * @param kEvent $event
 		 */
 		function performImport($event)
 		{
 			if (!$this->exportOptions) {
 				// load import options in case if not previously loaded in verification function
 				$this->exportOptions = $this->loadOptions($event);
 			}
 
 			$backup_category_id = $this->Application->GetVar('m_cat_id');
 			$this->Application->SetVar('m_cat_id', (int)$this->Application->RecallVar('ImportCategory') );
 
 			$this->openFile($event);
 
 			$bytes_imported = 0;
 			if ($this->exportOptions['start_from'] == 0) // first export step
 			{
 				// 1st time run
 				if ($this->exportOptions['SkipFirstRow']) {
 					$this->readRecord();
 					$this->exportOptions['start_from'] = ftell($this->filePointer);
 					$bytes_imported = ftell($this->filePointer);
 				}
 
 				$current_category_id = $this->Application->GetVar('m_cat_id');
 				if ($current_category_id > 0) {
 					$sql = 'SELECT ParentPath FROM '.TABLE_PREFIX.'Categories WHERE CategoryId = '.$current_category_id;
 					$this->exportOptions['ImportCategoryPath'] = $this->Conn->GetOne($sql);
 				}
 				else {
 					$this->exportOptions['ImportCategoryPath'] = '';
 				}
 				$this->exportOptions['total_records'] = filesize($this->getImportFilename());
 			}
 			else {
 				$this->loadCache();
 			}
 
 			$this->exportFields = $this->exportOptions['ExportColumns'];
 			$this->addToCache('category_parent_path', $this->Application->GetVar('m_cat_id'), $this->exportOptions['ImportCategoryPath']);
 
 			// 2. import data
 			$this->dummyCategory = $this->Application->recallObject('c.-tmpitem', 'c', Array('skip_autoload' => true));
 			fseek($this->filePointer, $this->exportOptions['start_from']);
 
 			$items_processed = 0;
 			while (($bytes_imported < IMPORT_CHUNK && $items_processed < IMPORT_STEP) && !feof($this->filePointer)) {
 				$data = $this->readRecord();
 				if ($data) {
 					if ($this->exportOptions['ReplaceDuplicates']) {
 						// set fields used as keys for replace duplicates code
 						$this->resetImportObject($event, IMPORT_TEMP, $data);
 					}
 
 					$this->processCurrentItem($event, $data);
 				}
 				$bytes_imported = ftell($this->filePointer) - $this->exportOptions['start_from'];
 				$items_processed++;
 			}
 
 			$this->closeFile();
 			$this->Application->SetVar('m_cat_id', $backup_category_id);
 
 			$this->exportOptions['start_from'] += $bytes_imported;
 			$this->storeCache('new_ids');
 
 			$this->saveOptions($event);
 
 			if ($this->exportOptions['start_from'] == $this->exportOptions['total_records']) {
 				$this->Conn->Query('TRUNCATE TABLE '.$this->cacheTable);
 			}
 
 			return $this->exportOptions;
 		}
 
 		function setCurrentID()
 		{
 			$this->curItem->setID( $this->curItem->GetDBField($this->curItem->IDField) );
 		}
 
 		/**
 		 * Sets value of import/export object
 		 * @param int $field_index
 		 * @param mixed $value
 		 * @return void
 		 * @access protected
 		 */
 		protected function setFieldValue($field_index, $value)
 		{
 			if ( empty($value) ) {
 				$value = null;
 			}
 
 			$field_name = getArrayValue($this->exportFields, $field_index);
 			if ( $field_name == 'ResourceId' ) {
 				return ;
 			}
 
 			if ( substr($field_name, 0, 7) == 'Custom_' ) {
 				$field_name = 'cust_' . substr($field_name, 7);
 				$this->curItem->SetField($field_name, $value);
 			}
 			elseif ( $field_name == 'CategoryPath' || $field_name == '__CATEGORY__CategoryPath' ) {
 				$this->curItem->CategoryPath = $value ? explode($this->exportOptions['CategorySeparator'], $value) : Array ();
 			}
 			elseif ( substr($field_name, 0, 8) == 'Category' ) {
 				$this->curItem->CategoryPath[(int)substr($field_name, 8) - 1] = $value;
 			}
 			elseif ( substr($field_name, 0, 20) == '__CATEGORY__Category' ) {
 				$this->curItem->CategoryPath[(int)substr($field_name, 20) - 1] = $value;
 			}
 			elseif ( substr($field_name, 0, 11) == '__VIRTUAL__' ) {
 				$field_name = substr($field_name, 11);
 				$this->curItem->SetField($field_name, $value);
 			}
 			else {
 				$this->curItem->SetField($field_name, $value);
 			}
 
 			if ( $this->curItem->GetErrorPseudo($field_name) ) {
 				$this->curItem->SetDBField($field_name, null);
 				$this->curItem->RemoveError($field_name);
 			}
 		}
 
 		/**
 		 * Resets import object
 		 *
 		 * @param kEvent $event
 		 * @param int $object_type
 		 * @param Array $record_data
 		 * @return void
 		 */
 		function resetImportObject($event, $object_type, $record_data = null)
 		{
 			switch ($object_type) {
 				case IMPORT_TEMP:
 					$this->curItem = $event->getObject( Array('skip_autoload' => true) );
 					break;
 
 				case IMPORT_LIVE:
 					$this->curItem = $this->Application->recallObject($event->Prefix.'.-tmpitem'.$event->Special, $event->Prefix, Array('skip_autoload' => true));
 					break;
 			}
 			$this->curItem->Clear();
 			$this->curItem->SetDBField('CategoryId', NULL); // since default value is import root category
 			$this->customFields = $event->getUnitConfig()->getCustomFields();
 
 			if (isset($record_data)) {
 				$this->setImportData($record_data);
 			}
 		}
 
 		function setImportData($record_data)
 		{
 			foreach ($record_data as $field_index => $field_value) {
 				$this->setFieldValue($field_index, $field_value);
 			}
 			$this->setCurrentID();
 		}
 
 
 		function getItemCategory()
 		{
 			static $lang_prefix = null;
 			$backup_category_id = $this->Application->GetVar('m_cat_id');
 
 			$category_id = $this->getFromCache('category_names', implode(':', $this->curItem->CategoryPath));
 			if ($category_id) {
 				$this->Application->SetVar('m_cat_id', $category_id);
 				return $category_id;
 			}
 
 			if (is_null($lang_prefix)) {
 				$lang_prefix = 'l'.$this->Application->GetVar('m_lang').'_';
 			}
 
 			foreach ($this->curItem->CategoryPath as $category_index => $category_name) {
 				if (!$category_name) continue;
 				$category_key = kUtil::crc32( implode(':', array_slice($this->curItem->CategoryPath, 0, $category_index + 1) ) );
 
 				$category_id = $this->getFromCache('category_names', $category_key);
 				if ($category_id === false) {
 					// get parent category path to search only in it
 					$current_category_id = $this->Application->GetVar('m_cat_id');
 //					$parent_path = $this->getParentPath($current_category_id);
 
 					// get category id from database by name
 					$sql = 'SELECT CategoryId
 							FROM '.TABLE_PREFIX.'Categories
 							WHERE ('.$lang_prefix.'Name = '.$this->Conn->qstr($category_name).') AND (ParentId = '.(int)$current_category_id.')';
 					$category_id = $this->Conn->GetOne($sql);
 
 					if ( $category_id === false ) {
 						// category not in db -> create
 						$category_fields = Array (
 							$lang_prefix.'Name' => $category_name, $lang_prefix.'Description' => $category_name,
 							'Status' => STATUS_ACTIVE, 'ParentId' => $current_category_id, 'AutomaticFilename' => 1
 						);
 
 						$this->dummyCategory->Clear();
 						$this->dummyCategory->SetDBFieldsFromHash($category_fields);
 
 						if ( $this->dummyCategory->Create() ) {
 							$category_id = $this->dummyCategory->GetID();
 							$this->addToCache('category_parent_path', $category_id, $this->dummyCategory->GetDBField('ParentPath'));
 							$this->addToCache('category_names', $category_key, $category_id);
 						}
 					}
 					else {
 						$this->addToCache('category_names', $category_key, $category_id);
 					}
 				}
 
 				if ($category_id) {
 					$this->Application->SetVar('m_cat_id', $category_id);
 				}
 			}
 			if (!$this->curItem->CategoryPath) {
 				$category_id = $backup_category_id;
 			}
 
 			return $category_id;
 		}
 
 		/**
 		 * Enter description here...
 		 *
 		 * @param kEvent $event
 		 * @param Array $record_data
 		 * @return bool
 		 */
 		function processCurrentItem($event, $record_data)
 		{
 			$save_method = 'Create';
 			$load_keys = Array ();
 
 			// create/update categories
 			$backup_category_id = $this->Application->GetVar('m_cat_id');
 
 			// perform replace duplicates code
 			if ( $this->exportOptions['ReplaceDuplicates'] ) {
 				// get replace keys first, then reset current item to empty one
 				$category_id = $this->getItemCategory();
 
 				if ( $this->exportOptions['CheckDuplicatesMethod'] == 1 ) {
 					if ( $this->curItem->GetID() ) {
 						$load_keys = Array ($this->curItem->IDField => $this->curItem->GetID());
 					}
 				}
 				else {
 					$key_fields = $this->exportOptions['DuplicateCheckFields'];
 
 					foreach ($key_fields as $key_field) {
 						$load_keys[$key_field] = $this->curItem->GetDBField($key_field);
 					}
 				}
 
 				$this->resetImportObject($event, IMPORT_LIVE);
 
 				if ( count($load_keys) ) {
 					$where_clause = '';
 					$language_id = (int)$this->Application->GetVar('m_lang');
 
 					if ( !$language_id ) {
 						$language_id = 1;
 					}
 
 					foreach ($load_keys as $field_name => $field_value) {
 						if ( preg_match('/^cust_(.*)/', $field_name, $regs) ) {
 							$custom_id = array_search($regs[1], $this->customFields);
 							$field_name = 'l' . $language_id . '_cust_' . $custom_id;
 							$where_clause .= '(custom_data.`' . $field_name . '` = ' . $this->Conn->qstr($field_value) . ') AND ';
 						}
 						else {
 							$where_clause .= '(item_table.`' . $field_name . '` = ' . $this->Conn->qstr($field_value) . ') AND ';
 						}
 					}
 					$where_clause = substr($where_clause, 0, -5);
 
 					$item_id = $this->getFromCache('new_ids', kUtil::crc32($where_clause));
 
 					if ( !$item_id ) {
 						if ( $this->exportOptions['CheckDuplicatesMethod'] == 2 ) {
 							// by other fields
 							$parent_path = $this->getParentPath($category_id);
 							$where_clause = '(c.ParentPath LIKE "' . $parent_path . '%") AND ' . $where_clause;
 						}
 
 						$cdata_table = $this->Application->getUnitConfig($event->Prefix . '-cdata')->getTableName();
 
 						$sql = 'SELECT ' . $this->curItem->IDField . '
 								FROM ' . $this->curItem->TableName . ' item_table
 								LEFT JOIN ' . $cdata_table . ' custom_data ON custom_data.ResourceId = item_table.ResourceId
 								LEFT JOIN ' . TABLE_PREFIX . 'CategoryItems ci ON ci.ItemResourceId = item_table.ResourceId
 								LEFT JOIN ' . TABLE_PREFIX . 'Categories c ON c.CategoryId = ci.CategoryId
 								WHERE ' . $where_clause;
 						$item_id = $this->Conn->GetOne($sql);
 					}
 
 					$save_method = $item_id && $this->curItem->Load($item_id) ? 'Update' : 'Create';
 
 					if ( $save_method == 'Update' ) {
 						// replace id from csv file with found id (only when ID is found in cvs file)
 						if ( in_array($this->curItem->IDField, $this->exportFields) ) {
 							$record_data[array_search($this->curItem->IDField, $this->exportFields)] = $item_id;
 						}
 					}
 				}
 
 				$this->setImportData($record_data);
 			}
 			else {
 				$this->resetImportObject($event, IMPORT_LIVE, $record_data);
 				$category_id = $this->getItemCategory();
 			}
 
 			// create main record
 			if ( $save_method == 'Create' ) {
 				$this->fillRequiredFields($this->false, $this->curItem, true);
 			}
 
 //			$sql_start = microtime(true);
 			if ( !$this->curItem->$save_method() ) {
 				$this->Application->SetVar('m_cat_id', $backup_category_id);
 
 				return false;
 			}
 //			$sql_end = microtime(true);
 //			$this->saveLog('SQL ['.$save_method.'] Time: '.($sql_end - $sql_start).'s');
 
 			if ( $load_keys && ($save_method == 'Create') && $this->exportOptions['ReplaceDuplicates'] ) {
 				// map new id to old id
 				$this->addToCache('new_ids', kUtil::crc32($where_clause), $this->curItem->GetID());
 			}
 
 			// assign item to categories
 			$this->curItem->assignToCategory($category_id, false);
 
 			$this->Application->SetVar('m_cat_id', $backup_category_id);
 
 			return true;
 		}
 
 		/*function saveLog($msg)
 		{
 			static $first_time = true;
 
 			$fp = fopen((defined('RESTRICTED') ? RESTRICTED : FULL_PATH) . '/sqls.log', $first_time ? 'w' : 'a');
 			fwrite($fp, $msg."\n");
 			fclose($fp);
 
 			$first_time = false;
 		}*/
 
 		/**
 		 * Returns category parent path, if possible, then from cache
 		 *
 		 * @param int $category_id
 		 * @return string
 		 */
 		function getParentPath($category_id)
 		{
 			$parent_path = $this->getFromCache('category_parent_path', $category_id);
 			if ($parent_path === false) {
 				$sql = 'SELECT ParentPath
 						FROM '.TABLE_PREFIX.'Categories
 						WHERE CategoryId = '.$category_id;
 				$parent_path = $this->Conn->GetOne($sql);
 				$this->addToCache('category_parent_path', $category_id, $parent_path);
 			}
 			return $parent_path;
 		}
 
 		function getFileExtension()
 		{
 			return $this->exportOptions['ExportFormat'] == 1 ? 'csv' : 'xml';
 		}
 
 		function getLineSeparator($option = 'LineEndings')
 		{
 			return $this->exportOptions[$option] == 1 ? "\r\n" : "\n";
 		}
 
 		/**
 		 * Returns field caption for any exported field
 		 *
 		 * @param string $field
 		 * @return string
 		 */
 		function getFieldCaption($field)
 		{
 			if (substr($field, 0, 10) == '__CUSTOM__')
 			{
 				$ret = 'Custom_'.substr($field, 10, strlen($field) );
 			}
 			elseif (substr($field, 0, 12) == '__CATEGORY__')
 			{
 				return $this->getCategoryTitle();
 			}
 			elseif (substr($field, 0, 11) == '__VIRTUAL__') {
 				$ret = substr($field, 11);
 			}
 			else
 			{
 				$ret = $field;
 			}
 
 			return Array($ret);
 		}
 
 		/**
 		 * Returns requested field value (including custom fields and category fields)
 		 *
 		 * @param string $field
 		 * @return string
 		 */
 		function getFieldValue($field)
 		{
 			if (substr($field, 0, 10) == '__CUSTOM__') {
 				$field = 'cust_'.substr($field, 10, strlen($field));
 				$ret = $this->curItem->GetField($field);
 			}
 			elseif (substr($field, 0, 12) == '__CATEGORY__') {
 				return $this->getCategoryPath();
 			}
 			elseif (substr($field, 0, 11) == '__VIRTUAL__') {
 				$field = substr($field, 11);
 				$ret = $this->curItem->GetField($field);
 			}
 			else
 			{
 				$ret = $this->curItem->GetField($field);
 			}
 
 			$ret = str_replace("\r\n", $this->getLineSeparator('LineEndingsInside'), $ret);
 			return Array($ret);
 		}
 
 		/**
 		 * Returns category field(-s) caption based on export mode
 		 *
 		 * @return string
 		 */
 		function getCategoryTitle()
 		{
 			// category path in separated fields
 			$category_count = $this->getMaxCategoryLevel();
 			if ($this->exportOptions['CategoryFormat'] == 1)
 			{
 				// category path in one field
 				return $category_count ? Array('CategoryPath') : Array();
 			}
 			else
 			{
 				$i = 0;
 				$ret = Array();
 				while ($i < $category_count) {
 					$ret[] = 'Category'.($i + 1);
 					$i++;
 				}
 				return $ret;
 			}
 		}
 
 		/**
 		 * Returns category path in required format for current link
 		 *
 		 * @return string
 		 */
 		function getCategoryPath()
 		{
 			$category_id = $this->curItem->GetDBField('CategoryId');
 			$category_path = $this->getFromCache('category_path', $category_id);
 
 			if ( !$category_path ) {
+				/** @var kMultiLanguage $ml_formatter */
 				$ml_formatter = $this->Application->recallObject('kMultiLanguage');
-				/* @var $ml_formatter kMultiLanguage */
 
 				$sql = 'SELECT ' . $ml_formatter->LangFieldName('CachedNavbar') . '
 						FROM ' . TABLE_PREFIX . 'Categories
 						WHERE CategoryId = ' . $category_id;
 				$category_path = $this->Conn->GetOne($sql);
 
 				$category_path = $category_path ? explode('&|&', $category_path) : Array ();
 
 				if ( $category_path && strtolower($category_path[0]) == 'content' ) {
 					array_shift($category_path);
 				}
 
 				if ( $this->exportOptions['IsBaseCategory'] ) {
 					$i = $this->exportOptions['BaseLevel'];
 					while ( $i > 0 ) {
 						array_shift($category_path);
 						$i--;
 					}
 				}
 
 				$category_count = $this->getMaxCategoryLevel();
 
 				if ( $this->exportOptions['CategoryFormat'] == 1 ) {
 					// category path in single field
 					$category_path = $category_count ? Array (implode($this->exportOptions['CategorySeparator'], $category_path)) : Array ();
 				}
 				else {
 					// category path in separated fields
 					$levels_used = count($category_path);
 
 					if ( $levels_used < $category_count ) {
 						$i = 0;
 						while ( $i < $category_count - $levels_used ) {
 							$category_path[] = '';
 							$i++;
 						}
 					}
 				}
 				$this->addToCache('category_path', $category_id, $category_path);
 			}
 
 			return $category_path;
 		}
 
 		/**
 		 * Get maximal category deep level from links beeing exported
 		 *
 		 * @return int
 		 */
 		function getMaxCategoryLevel()
 		{
 			static $max_level = -1;
 
 			if ($max_level != -1)
 			{
 				return $max_level;
 			}
 
 			$sql = 'SELECT IF(c.CategoryId IS NULL, 0, MAX( LENGTH(c.ParentPath) - LENGTH( REPLACE(c.ParentPath, "|", "") ) - 1 ))
 					FROM '.$this->curItem->TableName.' item_table
 					LEFT JOIN '.TABLE_PREFIX.'CategoryItems ci ON item_table.ResourceId = ci.ItemResourceId
 					LEFT JOIN '.TABLE_PREFIX.'Categories c ON c.CategoryId = ci.CategoryId
 					WHERE (ci.PrimaryCat = 1) AND ';
 
 			$where_clause = '';
 			if ($this->exportOptions['export_ids'] === false) {
 				// get links from current category & all it's subcategories
 				if ($this->exportOptions['export_cats_ids'][0] == 0) {
 					$where_clause = 1;
 				}
 				else {
 					foreach ($this->exportOptions['export_cats_ids'] as $category_id) {
 						$where_clause .= '(c.ParentPath LIKE "%|'.$category_id.'|%") OR ';
 					}
 					$where_clause = substr($where_clause, 0, -4);
 				}
 			}
 			else {
 				// get only selected links
 				$where_clause = $this->curItem->IDField.' IN ('.implode(',', $this->exportOptions['export_ids']).')';
 			}
 
 			$max_level = $this->Conn->GetOne($sql.'('.$where_clause.')');
 
 			if ($this->exportOptions['IsBaseCategory'] ) {
 				$max_level -= $this->exportOptions['BaseLevel'];
 			}
 
 			return $max_level;
 		}
 
 		/**
 		 * Saves one record to export file
 		 *
 		 * @param Array $fields_hash
 		 */
 		function writeRecord($fields_hash)
 		{
 			kUtil::fputcsv($this->filePointer, $fields_hash, $this->exportOptions['FieldsSeparatedBy'], $this->exportOptions['FieldsEnclosedBy'], $this->getLineSeparator() );
 		}
 
 		function readRecord()
 		{
 			return fgetcsv($this->filePointer, 10000, $this->exportOptions['FieldsSeparatedBy'], $this->exportOptions['FieldsEnclosedBy']);
 		}
 
 		/**
 		 * Saves import/export options
 		 *
 		 * @param kEvent $event
 		 * @param Array $options
 		 * @return void
 		 */
 		function saveOptions($event, $options = null)
 		{
 			if ( !isset($options) ) {
 				$options = $this->exportOptions;
 			}
 
 			$this->Application->StoreVar($event->getPrefixSpecial() . '_options', serialize($options));
 		}
 
 		/**
 		 * Loads import/export options
 		 *
 		 * @param kEvent $event
 		 * @return Array
 		 */
 		function loadOptions($event)
 		{
 			return unserialize( $this->Application->RecallVar($event->getPrefixSpecial() . '_options') );
 		}
 
 		/**
 		 * Sets correct available & export fields
 		 *
 		 * @param kEvent $event
 		 */
 		function prepareExportColumns($event)
 		{
+			/** @var kCatDBItem $object */
 			$object = $event->getObject(Array ('skip_autoload' => true));
-			/* @var $object kCatDBItem */
 
 			if ( !$object->isField('ExportColumns') ) {
 				// import/export prefix was used (see kDBEventHandler::prepareObject) but object don't plan to be imported/exported
 				return;
 			}
 
 			$available_columns = Array ();
 
 			if ( $event->getUnitConfig()->getCatalogItem() ) {
 				// category field (mixed)
 				$available_columns['__CATEGORY__CategoryPath'] = 'CategoryPath';
 
 				if ( $event->Special == 'import' ) {
 					// category field (separated fields)
 					$max_level = $this->Application->ConfigValue('MaxImportCategoryLevels');
 					$i = 0;
 					while ( $i < $max_level ) {
 						$available_columns['__CATEGORY__Category' . ($i + 1)] = 'Category' . ($i + 1);
 						$i++;
 					}
 				}
 			}
 
 			// db fields
 			$fields = $object->getFields();
 
 			foreach ($fields as $field_name => $field_options) {
 				if ( !$object->skipField($field_name) ) {
 					$available_columns[$field_name] = $field_name . ($object->isRequired($field_name) ? '*' : '');
 				}
 			}
 
+			/** @var kDBEventHandler $handler */
 			$handler = $this->Application->recallObject($event->Prefix . '_EventHandler');
-			/* @var $handler kDBEventHandler */
 
 			$available_columns = array_merge($available_columns, $handler->getCustomExportColumns($event));
 
 			// custom fields
 			$custom_fields = $object->getCustomFields();
 
 			foreach ($custom_fields as $custom_id => $custom_name) {
 				$available_columns['__CUSTOM__' . $custom_name] = $custom_name;
 			}
 
 			// columns already in use
 			$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
 			if ( $items_info ) {
 				list($item_id, $field_values) = each($items_info);
 				$export_keys = $field_values['ExportColumns'];
 				$export_keys = $export_keys ? explode('|', substr($export_keys, 1, -1)) : Array ();
 			}
 			else {
 				$export_keys = Array ();
 			}
 
 			$export_columns = Array ();
 			foreach ($export_keys as $field_key) {
 				$field_name = $this->getExportField($field_key);
 				$export_columns[$field_key] = $field_name;
 				unset($available_columns[$field_key]);
 			}
 
 			$options = $object->GetFieldOptions('ExportColumns');
 			$options['options'] = $export_columns;
 			$object->SetFieldOptions('ExportColumns', $options);
 
 			$options = $object->GetFieldOptions('AvailableColumns');
 			$options['options'] = $available_columns;
 			$object->SetFieldOptions('AvailableColumns', $options);
 
 			$this->updateImportFiles($event);
 			$this->PrepareExportPresets($event);
 		}
 
 		/**
 		 * Prepares export presets
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 */
 		function PrepareExportPresets($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject(Array ('skip_autoload' => true));
-			/* @var $object kDBItem */
 
 			$options = $object->GetFieldOptions('ExportPresets');
 			$export_settings = $this->Application->RecallPersistentVar('export_settings');
 
 			if ( !$export_settings ) {
 				return;
 			}
 
 			$export_settings = unserialize($export_settings);
 
 			if ( !isset($export_settings[$event->Prefix]) ) {
 				return;
 			}
 
 			$export_presets = array ('' => '');
 
 			foreach ($export_settings[$event->Prefix] as $key => $val) {
 				$export_presets[implode('|', $val['ExportColumns'])] = $key;
 			}
 
 			$options['options'] = $export_presets;
 			$object->SetFieldOptions('ExportPresets', $options);
 		}
 
 		function getExportField($field_key)
 		{
 			$prepends = Array('__CUSTOM__', '__CATEGORY__');
 			foreach ($prepends as $prepend)
 			{
 				if (substr($field_key, 0, strlen($prepend) ) == $prepend)
 				{
 					$field_key = substr($field_key, strlen($prepend), strlen($field_key) );
 					break;
 				}
 			}
 			return $field_key;
 		}
 
 		/**
 		 * Updates uploaded files list
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function updateImportFiles($event)
 		{
 			if ( $event->Special != 'import' ) {
 				return ;
 			}
 
+			/** @var FileHelper $file_helper */
 			$file_helper = $this->Application->recallObject('FileHelper');
-			/* @var $file_helper FileHelper */
 
 			$import_filenames = Array ();
 			$file_helper->CheckFolder(EXPORT_PATH);
 
 			$iterator = new DirectoryIterator(EXPORT_PATH);
-			/* @var $file_info DirectoryIterator */
+			/** @var DirectoryIterator $file_info */
 
 			foreach ($iterator as $file_info) {
 				$file = $file_info->getFilename();
 
 				if ( $file_info->isDir() || $file == 'dummy' || $file_info->getSize() == 0 ) {
 					continue;
 				}
 
 				$import_filenames[$file] = $file . ' (' . kUtil::formatSize( $file_info->getSize() ) . ')';
 			}
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$object->SetFieldOption('ImportLocalFilename', 'options', $import_filenames);
 		}
 
 		/**
 		 * Returns module folder
 		 *
 		 * @param kEvent $event
 		 * @return string
 		 */
 		function getModuleName($event)
 		{
 			$module_path = $event->getUnitConfig()->getModuleFolder() . '/';
 			$module_name = $this->Application->findModule('Path', $module_path, 'Name');
 
 			return mb_strtolower($module_name);
 		}
 
 		/**
 		 * Export form validation & processing
 		 *
 		 * @param kEvent $event
 		 */
 		function OnExportBegin($event)
 		{
 			$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
 
 			if ( !$items_info ) {
 				$items_info = unserialize($this->Application->RecallVar($event->getPrefixSpecial() . '_ItemsInfo'));
 				$this->Application->SetVar($event->getPrefixSpecial(true), $items_info);
 			}
 
 			list($item_id, $field_values) = each($items_info);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject(Array ('skip_autoload' => true));
-			/* @var $object kDBItem */
 
 			$object->SetFieldsFromHash($field_values);
 			$field_values['ImportFilename'] = $object->GetDBField('ImportFilename'); //if upload formatter has renamed the file during moving !!!
 
 			$object->setID($item_id);
 			$this->setRequiredFields($event);
 
 			// save export/import options
 			if ( $event->Special == 'export' ) {
 				$export_ids = $this->Application->RecallVar($event->Prefix . '_export_ids');
 				$export_cats_ids = $this->Application->RecallVar($event->Prefix . '_export_cats_ids');
 
 				// used for multistep export
 				$field_values['export_ids'] = $export_ids ? explode(',', $export_ids) : false;
 				$field_values['export_cats_ids'] = $export_cats_ids ? explode(',', $export_cats_ids) : Array ($this->Application->GetVar('m_cat_id'));
 				$field_values['export_special'] = $this->Application->RecallVar('export_special');
 				$field_values['export_grid'] = $this->Application->RecallVar('export_grid');
 			}
 
 			$field_values['ExportColumns'] = $field_values['ExportColumns'] ? explode('|', substr($field_values['ExportColumns'], 1, -1) ) : Array();
 			$field_values['start_from'] = 0;
 
 			$nevent = new kEvent($event->Prefix . ':OnBeforeExportBegin');
 			$nevent->setEventParam('options', $field_values);
 			$this->Application->HandleEvent($nevent);
 			$field_values = $nevent->getEventParam('options');
 
 			$this->saveOptions($event, $field_values);
 
 			if ( $this->verifyOptions($event) ) {
 				if ( $this->_getExportSavePreset($object) ) {
 					$name = $object->GetDBField('ExportPresetName');
 
 					$export_settings = $this->Application->RecallPersistentVar('export_settings');
 					$export_settings = $export_settings ? unserialize($export_settings) : array ();
 					$export_settings[$event->Prefix][$name] = $field_values;
 					$this->Application->StorePersistentVar('export_settings', serialize($export_settings));
 				}
 
 				$progress_t = $this->Application->RecallVar('export_progress_t');
 				if ( $progress_t ) {
 					$this->Application->RemoveVar('export_progress_t');
 				}
 				else {
 					$progress_t = $this->getModuleName($event) . '/' . $event->Special . '_progress';
 				}
 				$event->redirect = $progress_t;
 
 				if ( $event->Special == 'import' ) {
 					$import_category = (int)$this->Application->RecallVar('ImportCategory');
 
 					// in future could use module root category if import category will be unavailable :)
 					$event->SetRedirectParam('m_cat_id', $import_category); // for template permission checking
 					$this->Application->StoreVar('m_cat_id', $import_category); // for event permission checking
 				}
 			}
 			else {
 				// make uploaded file local & change source selection
 				$filename = getArrayValue($field_values, 'ImportFilename');
 
 				if ( $filename ) {
 					$this->updateImportFiles($event);
 					$object->SetDBField('ImportSource', 2);
 					$field_values['ImportSource'] = 2;
 					$object->SetDBField('ImportLocalFilename', $filename);
 					$field_values['ImportLocalFilename'] = $filename;
 					$this->saveOptions($event, $field_values);
 				}
 
 				$event->status = kEvent::erFAIL;
 				$event->redirect = false;
 			}
 		}
 
 		/**
 		 * Returns export save preset name, when used at all
 		 *
 		 * @param kDBItem $object
 		 * @return string
 		 */
 		function _getExportSavePreset(&$object)
 		{
 			if ( !$object->isField('ExportSavePreset') ) {
 				return '';
 			}
 
 			return $object->GetDBField('ExportSavePreset');
 		}
 
 		/**
 		 * set required fields based on import or export params
 		 *
 		 * @param kEvent $event
 		 */
 		function setRequiredFields($event)
 		{
 			$required_fields['common'] = Array('FieldsSeparatedBy', 'LineEndings', 'CategoryFormat');
 
 			$required_fields['export'] = Array('ExportFormat', 'ExportFilename','ExportColumns');
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			if ($this->_getExportSavePreset($object)) {
 				$required_fields['export'][] = 'ExportPresetName';
 			}
 
 			$required_fields['import'] = Array('FieldTitles', 'ImportSource', 'CheckDuplicatesMethod'); // ImportFilename, ImportLocalFilename
 
 			if ($event->Special == 'import')
 			{
 				$import_source = Array(1 => 'ImportFilename', 2 => 'ImportLocalFilename');
 				$used_field = $import_source[ $object->GetDBField('ImportSource') ];
 
 				$required_fields[$event->Special][] = $used_field;
 				$object->SetFieldOption($used_field, 'error_field', 'ImportSource');
 
 				if ($object->GetDBField('FieldTitles') == 2) $required_fields[$event->Special][] = 'ExportColumns'; // manual field titles
 			}
 
 			$required_fields = array_merge($required_fields['common'], $required_fields[$event->Special]);
 			$object->setRequired($required_fields);
 		}
 
 	}
Index: branches/5.3.x/core/units/helpers/brackets_helper.php
===================================================================
--- branches/5.3.x/core/units/helpers/brackets_helper.php	(revision 16518)
+++ branches/5.3.x/core/units/helpers/brackets_helper.php	(revision 16519)
@@ -1,476 +1,476 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class kBracketsHelper extends kHelper {
 
 		/**
 		 * Field name holding minimal amount
 		 *
 		 * @var string
 		 */
 		var $min_field = '';
 
 		/**
 		 * Field name holding maximal amount
 		 *
 		 * @var string
 		 */
 		var $max_field = '';
 
 		/**
 		 * Default values to be set to automtically created price brackets
 		 *
 		 * @var Array
 		 */
 		var $default_values = Array();
 
 		var $defaultStartValue = 1;
 
 		/**
 		 * Decimal separator
 		 *
 		 * @var string
 		 */
 		var $_decimalSeparator = '';
 
 		/**
 		 * Thousands separator
 		 *
 		 * @var string
 		 */
 		var $_thousandsSeparator = '';
 
 		/**
 		 * Current language
 		 *
 		 * @var LanguagesItem
 		 */
 		var $_language = null;
 
 		public function __construct()
 		{
 			parent::__construct();
 
 			$this->_language = $this->Application->recallObject('lang.current');
-			/* @var $lang kDBItem */
+			/** @var kDBItem $lang */
 
 			$this->_decimalSeparator = $this->_language->GetDBField('DecimalPoint');
 			$this->_thousandsSeparator = $this->_language->GetDBField('ThousandSep');
 		}
 
 		function InitHelper($min_field, $max_field, $default_values, $default_start_value = null)
 		{
 			$this->min_field = $min_field;
 			$this->max_field = $max_field;
 			$this->default_values = $default_values;
 
 			if (isset($default_start_value)) {
 				$this->defaultStartValue = $default_start_value;
 			}
 		}
 
 		/**
 		 * Converts number to operatable form
 		 *
 		 * @param string $value
 		 * @return float
 		 */
 		function _parseNumber($value)
 		{
 			$value = str_replace($this->_thousandsSeparator, '', $value);
 			$value = str_replace($this->_decimalSeparator, '.', $value);
 
 			return $value;
 		}
 
 		/**
 		 * Returns brackets from form with all numbers parsed
 		 *
 		 * @param kEvent $event
 		 * @return Array
 		 */
 		function getBrackets($event)
 		{
 			$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
 
 			return $this->parseBrackets($items_info);
 		}
 
 		function parseBrackets($brackets)
 		{
 			if (!$brackets) {
 				return $brackets;
 			}
 
 			foreach ($brackets as $id => $field_values) {
 				if (strlen($brackets[$id][$this->min_field])) {
 					$brackets[$id][$this->min_field] = (float)$this->_parseNumber($brackets[$id][$this->min_field]);
 				}
 
 				if (strlen($brackets[$id][$this->max_field])) {
 					$brackets[$id][$this->max_field] = (float)$this->_parseNumber($brackets[$id][$this->max_field]);
 				}
 			}
 
 			return $brackets;
 		}
 
 		/**
 		 * Formats given brackets and sets them back to request
 		 *
 		 * @param kEvent $event
 		 * @param Array $brackets
 		 */
 		function setBrackets($event, $brackets)
 		{
 			$brackets = $this->formatBrackets($brackets);
 
 			$this->Application->SetVar($event->getPrefixSpecial(true), $brackets);
 		}
 
 		function formatBrackets($brackets)
 		{
 			if (!$brackets) {
 				return $brackets;
 			}
 
 			foreach ($brackets as $id => $field_values) {
 				if (strlen($brackets[$id][$this->min_field])) {
 					$brackets[$id][$this->min_field] = $this->_language->formatNumber($brackets[$id][$this->min_field]);
 				}
 
 				if (strlen($brackets[$id][$this->max_field])) {
 					$brackets[$id][$this->max_field] = $this->_language->formatNumber($brackets[$id][$this->max_field]);
 				}
 			}
 
 			return $brackets;
 		}
 
 		/**
 		 * Adds 5 more empty brackets to brackets
 		 *
 		 * @param kEvent $event
 		 */
 		function OnMoreBrackets($event)
 		{
 			$field_values = $this->getBrackets($event);
 
 			$object = $event->getObject();
 
 			foreach($field_values as $id => $record)
 			{
 				if($record[$this->max_field] == '&#8734;') $field_values[$id][$this->max_field] = -1;
 			}
 
 			$new_id = (int)$this->Conn->GetOne('SELECT MIN('.$object->IDField.') FROM '.$object->TableName);
 			if($new_id > 0) $new_id = 0;
 			do
 			{
 				$new_id--;
 			}while( $this->arraySearch($field_values, $object->IDField, $new_id) );
 
 
 			$last_max_qty = $this->Conn->GetOne('SELECT MAX('.$this->max_field.') FROM '.$object->TableName);
 			$min_qty = $this->Conn->GetOne('SELECT MIN('.$this->max_field.') FROM '.$object->TableName);
 
 			if($min_qty == -1) $last_max_qty = -1;
 			if(!$last_max_qty) $last_max_qty = $this->defaultStartValue;
 
 
 			for($i = $new_id; $i > $new_id - 5; $i--)
 			{
 				$field_values[$i][$object->IDField] = $i;
 				$field_values[$i][$this->min_field] = ($i == $new_id-4 && $last_max_qty != -1) ? $last_max_qty : '';
 				$field_values[$i][$this->max_field] = ($i == $new_id-4 && $last_max_qty != -1) ? -1 : '';
 				$field_values[$i] = array_merge($field_values[$i], $this->default_values);
 			}
 
 			$event->CallSubEvent('OnPreSaveBrackets');
 
 			$this->setBrackets($event, $field_values);
 		}
 
 		/**
 		 * Adds infinity bracket
 		 *
 		 * @param kEvent $event
 		 */
 		function OnInfinity($event)
 		{
 			$object = $event->getObject();
 			$infinite_exists = $this->Conn->GetOne('SELECT COUNT(*) FROM '.$object->TableName.' WHERE '.$this->max_field.' = -1');
 			$field_values = $this->getBrackets($event);
 			/*if(is_array($field_values))
 			{
 				foreach($field_values as $values)
 				{
 					$infinite_exists = $infinite_exists || ($values[$this->max_field] == -1);
 				}
 			}*/
 
 			if ($infinite_exists == 0) {
 				reset($field_values);
 				$last_bracket = end($field_values);
 				$new_id = (int)$this->Conn->GetOne('SELECT MIN('.$object->IDField.') FROM '.$object->TableName);
 
 				$brackets_exist = (int)$this->Conn->GetOne('SELECT COUNT(*) FROM '.$object->TableName);
 
 				if($new_id > 0) $new_id = 0;
 				do
 				{
 					$new_id--;
 				}while( $this->arraySearch($field_values, $object->IDField, $new_id) );
 
 				$infinite_bracket[$object->IDField] = $new_id;
 				$infinite_bracket[$this->min_field] = ($brackets_exist > 0) ? $last_bracket[$this->max_field] : $this->defaultStartValue;
 				$infinite_bracket[$this->max_field] = '-1';
 				$infinite_bracket = array_merge($infinite_bracket, $this->default_values);
 
 				$field_values[$new_id] = $infinite_bracket;
 				reset($field_values);
 
 				$this->setBrackets($event, $field_values);
 			}
 		}
 
 		/**
 		 * Saves brackets to database
 		 *
 		 * @param kEvent $event
 		 */
 		function OnPreSaveBrackets($event)
 		{
 			$items_info = $this->getBrackets($event);
 			if ($items_info) {
+				/** @var kDBItem $object */
 				$object = $event->getObject();
-				/* @var $object kDBItem */
 
 				$linked_info = $object->getLinkedInfo();
 				$stored_ids = $this->Conn->GetCol('SELECT '.$object->IDField.' FROM '.$object->TableName.' WHERE '.$linked_info['ForeignKey'].' = '.$linked_info['ParentId']);
 
 				uasort($items_info, Array(&$this, 'compareBrackets') );
 
 				foreach ($items_info as $item_id => $values) {
 
 					if (in_array($item_id, $stored_ids)) { //if it's already exist
 						$object->Load($item_id);
 						$object->SetFieldsFromHash($values);
 						if (!$object->Validate()) {
 							unset($stored_ids[array_search($item_id, $stored_ids)]);
 							$event->redirect = false;
 							continue;
 						}
 						if( $object->Update($item_id) )
 						{
 							$event->status = kEvent::erSUCCESS;
 						}
 						else
 						{
 							$event->status = kEvent::erFAIL;
 							$event->redirect = false;
 							break;
 						}
 						unset( $stored_ids[ array_search($item_id, $stored_ids) ] );
 					}
 					else {
 						$object->Clear();
 						$object->SetFieldsFromHash($values);
 						$object->SetDBField($linked_info['ForeignKey'], $linked_info['ParentId']);
 
 						if ($object->Create()) {
 							$event->status = kEvent::erSUCCESS;
 						}
 					}
 				}
 
 				// delete
 				foreach ($stored_ids as $stored_id)
 				{
 					$this->Conn->Query('DELETE FROM '.$object->TableName.' WHERE '.$object->IDField.' = '.$stored_id);
 				}
 
 			}
 		}
 
 		/**
 		 * Sorts brackets and returns sorted array
 		 *
 		 * @param kEvent $event
 		 * @return Array
 		 */
 		function arrangeBrackets($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$temp = $this->getBrackets($event);
 
 			foreach ($temp as $id => $record) {
 				if ( $record[$this->max_field] == '&#8734;' ) {
 					$temp[$id][$this->max_field] = -1;
 				}
 			}
 
 			$temp_orig = $temp;
 			reset($temp);
 			if( is_array($temp) )
 			{
 				// array to store max values (2nd column)
 				$end_values = Array();
 
 				// get minimal value of Min
 				$first_elem = current($temp);
 				$start = $first_elem[$this->min_field];
 				if (!strlen($start)) {
 					$start = $this->defaultStartValue;
 				}
 
 				foreach($temp as $id => $record)
 				{
 					if(
 					// MAX is less than start
 					($record[$this->max_field] <= $start && $record[$this->max_field] != -1) ||
 					// Max is empty
 					!strlen($record[$this->max_field]) ||
 					// Max already defined in $end_values
 					(array_search($record[$this->max_field], $end_values) !== false)
 					) {	// then delete from brackets list
 						unset($temp[$id]);
 					}
 					else {	// this is when ok - add to end_values list
 						$end_values[] = $record[$this->max_field];
 					}
 				}
 
 				// sort brackets by 2nd column (Max values)
 				uasort($temp, Array (&$this, 'compareBrackets'));
 				reset($temp);
 				$first_item = each($temp);
 				$first_item_key = $first_item['key'];
 
 				$linked_info = $object->getLinkedInfo();
 				$sql = 'SELECT %s FROM %s WHERE %s = %s';
 				$ids = $this->Conn->GetCol( sprintf($sql, $object->IDField, $object->TableName, $linked_info['ForeignKey'], $linked_info['ParentId']) );
 
 				if ( is_array($ids) ) {
 					usort($ids, Array (&$this, 'sortBracketIDs'));
 				}
 
 //				$min_id = min( min($ids) - 1, -1 );
 
 				foreach ($temp as $key => $record) {
 					$temp[$key][$this->min_field] = $start;
 					$start = $temp[$key][$this->max_field];
 				}
 			}
 
 			$this->setBrackets($event, $temp);
 
 			return $temp;
 		}
 
 		function compareBrackets($bracket1, $bracket2) // ap_bracket_comp
 		{
 			$bracket1_min = $bracket1[$this->min_field];
 			$bracket1_max = $bracket1[$this->max_field];
 
 			$bracket2_min = $bracket2[$this->min_field];
 			$bracket2_max = $bracket2[$this->max_field];
 
 			// limits
 			if( ($bracket1_min != '') && ($bracket1_max == '') && ($bracket2_min != '') && ($bracket2_max != '') ) return 1;
 			if( ($bracket1_min != '') && ($bracket1_max == '') && ($bracket2_min == '') && ($bracket2_max == '') ) return -1;
 			if( ($bracket1_max == '') && ($bracket2_max != '') ) return 1;
 			if( ($bracket1_max != '') && ($bracket2_max == '') ) return -1;
 
 
 			if( ( ($bracket1_max > $bracket2_max) && ($bracket2_max != -1) ) || ( ($bracket1_max == -1) && ($bracket2_max != -1) ) )
 			{
 				return 1;
 			}
 			elseif( ($bracket1_max < $bracket2_max) || ( ($bracket2_max == -1) && ($bracket1_max != -1) ) )
 			{
 				return -1;
 			}
 			else
 			{
 				return 0;
 			}
 		}
 
 		function sortBracketIDs($first_id, $second_id) // pr_bracket_id_sort
 		{
 			$first_abs = abs($first_id);
 			$second_abs = abs($second_id);
 
 			$first_sign = ($first_id == 0) ? 0 : $first_id / $first_abs;
 			$second_sign = ($second_id == 0) ? 0 : $second_id / $second_abs;
 
 			if($first_sign != $second_sign)
 			{
 				if($first_id > $second_id)
 				{
 					$bigger =& $first_abs;
 					$smaller =& $second_abs;
 				}
 				else
 				{
 					$bigger =& $second_abs;
 					$smaller =& $first_abs;
 				}
 				$smaller = $bigger + $smaller;
 			}
 
 			return ($first_abs > $second_abs) ? 1 : ($first_abs < $second_abs ? -1 : 0);
 		}
 
 		/**
 		 * Searches through submitted grid data to find record with specific value in specific field
 		 *
 		 * @param Array $records // grid data from REQUEST
 		 * @param string $field
 		 * @param string $value
 		 * @return bool
 		 */
 		function arraySearch($records, $field, $value) // check_array
 		{
 			foreach ($records as $record)
 			{
 				if ($record[$field] == $value)
 				{
 					return true;
 				}
 			}
 			return false;
 		}
 
 		/**
 		 * Replace infinity mark with -1 before saving to db
 		 *
 		 * @param kEvent $event
 		 */
 		function replaceInfinity($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			if ( $object->GetDBField($this->max_field) == '&#8734;' ) {
 				$object->SetDBField($this->max_field, -1);
 			}
 		}
 
 	}
Index: branches/5.3.x/core/units/helpers/minifiers/minify_helper.php
===================================================================
--- branches/5.3.x/core/units/helpers/minifiers/minify_helper.php	(revision 16518)
+++ branches/5.3.x/core/units/helpers/minifiers/minify_helper.php	(revision 16519)
@@ -1,315 +1,315 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2010 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class MinifyHelper extends kHelper {
 
 		/**
 		 * Debug mode mark
 		 *
 		 * @var bool
 		 */
 		var $debugMode = false;
 
 		/**
 		 * Folder, that contains produced CSS/JS files
 		 *
 		 * @var string
 		 * @access protected
 		 */
 		protected $resourceFolder = '';
 
 		public function __construct()
 		{
 			parent::__construct();
 
 			$this->debugMode = $this->Application->isDebugMode(false);
 			$this->resourceFolder = WRITEABLE . '/cache';
 		}
 
 		/**
 		 * When used as non-block tag, then compress given files and return url to result
 		 *
 		 * @param Array $params
 		 * @return string
 		 * @access public
 		 */
 		public function CompressScriptTag($params)
 		{
 			// put to queue
 			if ( array_key_exists('to', $params) ) {
 				$files = $this->Application->GetVar($params['to'], '');
 				$this->Application->SetVar($params['to'], $files . '|' . $params['files']);
 
 				return '';
 			}
 
 			if ( array_key_exists('from', $params) ) {
 				// get from queue
 				$files = $this->Application->GetVar($params['from']);
 			}
 			else {
 				// get from tag
 				$files = $params['files'];
 			}
 
 			$files = $this->_getTemplatePaths( array_map('trim', explode('|', $files)) );
 
 			if ( !$files ) {
 				trigger_error('No files specified for compression.', E_USER_NOTICE);
 
 				return '';
 			}
 
 			$extension = pathinfo($files[0], PATHINFO_EXTENSION);
 			$save_as = isset($params['save_as']) ? $params['save_as'] : false;
 			$dst_file = $this->resourceFolder . DIRECTORY_SEPARATOR . ($this->debugMode ? 'd' : 'c') . '_';
 
 			/** @var FileHelper $file_helper */
 			$file_helper = $this->Application->recallObject('FileHelper');
 
 			if ( $save_as ) {
 				$dst_file .= $save_as . ( strpos($save_as, '.') === false ? '.' . $extension : '' );
 			}
 			else {
 				$dst_file .= $this->_getHash($file_helper->makeRelative($files)) . '.' . $extension;
 			}
 
 			$was_compressed = file_exists($dst_file);
 
 			if ( !$was_compressed || ($this->debugMode && filemtime($dst_file) < $this->_getMaxFileDate($files)) ) {
 				$string = '';
 				$path_length = strlen(FULL_PATH) + 1;
 
 				foreach ($files as $file) {
 					if ( !file_exists($file) ) {
 						continue;
 					}
 
 					// add filename before for easier debugging
 					if ( $this->debugMode ) {
 						$string .= '/* === File: ' . substr($file, $path_length) . ' === */' . "\n";
 						$string .= '/* ' . str_repeat('=', strlen(substr($file, $path_length)) + 14) . ' */' . "\n\n";
 					}
 
 					// add file content
 					$string .= file_get_contents($file) . "\n\n";
 				}
 
 				// replace templates base
 				if ( isset($params['templates_base']) ) {
 					$templates_base = $params['templates_base'];
 				}
 				else {
 					$templates_base = $this->Application->ProcessParsedTag('m', 'TemplatesBase', Array ());
 				}
 
 				$templates_base = preg_replace('/^' . preg_quote($this->Application->BaseURL(), '/') . '/', BASE_PATH . '/', $templates_base);
 				$string = str_replace('@templates_base@', rtrim($templates_base, '/'), $string);
 
 				if ( !$this->debugMode ) {
 					// don't compress merged js/css file in debug mode to allow js/css debugging
 					$this->compressString($string, $extension);
 				}
 
 				// save compressed file
 				file_put_contents($dst_file, $string);
 			}
 
 			return $file_helper->pathToUrl($dst_file) . '?ts=' . date('Y-m-d_H:i:s', filemtime($dst_file));
 		}
 
 		/**
 		 * Returns maximal modification date across given files
 		 *
 		 * @param Array $files
 		 * @return int
 		 * @access protected
 		 */
 		protected function _getMaxFileDate($files)
 		{
 			$ret = 0;
 
 			foreach ($files as $file) {
 				if ( file_exists($file) ) {
 					$ret = max($ret, filemtime($file));
 				}
 			}
 
 			return $ret;
 		}
 
 		/**
 		 * Returns hash string based on given files
 		 *
 		 * @param Array $files
 		 * @return int
 		 * @access protected
 		 */
 		protected function _getHash($files)
 		{
 			$hash = $files;
 
 			if ($this->Application->isAdmin) {
 				array_unshift($hash, 'A:1');
 			}
 			else {
 				array_unshift($hash, 'A:0;T:' . $this->Application->GetVar('m_theme'));
 			}
 
 			return kUtil::crc32(implode('|', $hash));
 		}
 
 		/**
 		 * Deletes compression info file
 		 *
 		 * @todo also delete all listed there files
 		 * @access public
 		 */
 		public function delete()
 		{
 			$iterator = new DirectoryIterator($this->resourceFolder);
-			/* @var $file_info DirectoryIterator */
+			/** @var DirectoryIterator $file_info */
 
 			foreach ($iterator as $file_info) {
 				if ( !$file_info->isDir() && preg_match('/^(c|d)_.*.(css|js)$/', $file_info->getFilename()) ) {
 					unlink( $file_info->getPathname() );
 				}
 			}
 		}
 
 		/**
 		 * Compress $string based on $extension
 		 *
 		 * @param string $string
 		 * @param string $extension
 		 * @return void
 		 * @access protected
 		 */
 		public function compressString(&$string, $extension)
 		{
 			$compression_engine = kUtil::getSystemConfig()->get('CompressionEngine');
 
 			if ( !$compression_engine ) {
 				// compression method not specified - use none
 				return;
 			}
 
 			switch ( $compression_engine ) {
 				case 'yui':
 					$this->compressViaJava($string, $extension);
 					break;
 
 				case 'php':
 					$this->compressViaPHP($string, $extension);
 					break;
 			}
 		}
 
 		/**
 		 * Compresses string using YUI compressor (uses Java)
 		 *
 		 * @param string $string
 		 * @param string $extension
 		 * @return void
 		 * @access protected
 		 */
 		protected function compressViaJava(&$string, $extension)
 		{
 			$tmp_file = tempnam('/tmp', 'to_compress_');
 			file_put_contents($tmp_file, $string);
 
 			$command = 'java -jar ' . dirname(__FILE__) . DIRECTORY_SEPARATOR . 'yuicompressor-2.4.2.jar --type ' . $extension . ' --charset utf-8 ' . $tmp_file;
 			$string = shell_exec($command);
 
 			unlink($tmp_file);
 		}
 
 		/**
 		 * Compresses string using PHP compressor
 		 *
 		 * @param string $string
 		 * @param string $extension
 		 * @return void
 		 * @access protected
 		 */
 		protected function compressViaPHP(&$string, $extension)
 		{
+			/** @var JsMinifyHelper $minifier */
 			$minifier = $this->Application->makeClass($extension == 'js' ? 'JsMinifyHelper' : 'CssMinifyHelper');
-			/* @var $minifier JsMinifyHelper */
 
 			$string = $minifier->minify($string);
 		}
 
 		/**
 		 * Get full paths on disk for each of given templates
 		 *
 		 * @param Array $templates
 		 * @return Array
 		 * @access protected
 		 */
 		protected function _getTemplatePaths($templates)
 		{
 			$ret = Array ();
 			$reg_exp = '/^' . preg_quote($this->Application->BaseURL(), '/') . '(.*)/';
 
 			foreach ($templates as $template) {
 				if ( !$template ) {
 					continue;
 				}
 
 				if ( preg_match($reg_exp, $template, $regs) ) {
 					// full url (from current domain) to a file
 					$ret[] = FULL_PATH . '/' . $regs[1];
 				}
 				elseif ( strpos($template, '{module_path}') !== false ) {
 					$ret = array_merge($ret, $this->_moduleInclude($template));
 				}
 				else {
 					$ret[] = $this->Application->TemplatesCache->GetRealFilename($template);
 				}
 			}
 
 			return $ret;
 		}
 
 		/**
 		 *
 		 * @param string $template
 		 * @return Array
 		 * @access protected
 		 */
 		protected function _moduleInclude($template)
 		{
 			$ret = $included = Array ();
 
 			foreach ($this->Application->ModuleInfo as $module_name => $module_data) {
 				if ( $module_name == 'In-Portal' ) {
 					continue;
 				}
 
 				$module_prefix = $this->Application->isAdmin ? mb_strtolower($module_name) . '/' : $module_data['TemplatePath'];
 
 				if ( in_array($module_prefix, $included) ) {
 					continue;
 				}
 
 				$ret[] = $this->Application->TemplatesCache->GetRealFilename(str_replace('{module_path}', $module_prefix, $template));
 				$included[] = $module_prefix;
 			}
 
 			return $ret;
 		}
 	}
Index: branches/5.3.x/core/units/helpers/cron_helper.php
===================================================================
--- branches/5.3.x/core/units/helpers/cron_helper.php	(revision 16518)
+++ branches/5.3.x/core/units/helpers/cron_helper.php	(revision 16519)
@@ -1,682 +1,682 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class kCronHelper extends kHelper {
 
 	const COMMON = 0;
 	const MINUTE = 1;
 	const HOUR = 2;
 	const DAY = 3;
 	const MONTH = 4;
 	const WEEKDAY = 5;
 
 	/**
 	 * Defines possible cron fields and their matching priority
 	 *
 	 * @var Array
 	 * @access protected
 	 */
 	protected $fieldTypes = Array (self::MONTH, self::DAY, self::WEEKDAY, self::HOUR, self::MINUTE);
 
 	protected $commonSettings = Array (
 		'* * * * *' => 'la_opt_CronEveryMinute',
 		'*/5 * * * *' => 'la_opt_CronEveryFiveMinutes',
 		'0,30 * * * *' => 'la_opt_CronTwiceAnHour',
 		'0 * * * *' => 'la_opt_CronOnceAnHour',
 		'0 0,12 * * *' => 'la_opt_CronTwiceADay',
 		'0 0 * * *' => 'la_opt_CronOnceADay',
 		'0 0 * * 0' => 'la_opt_CronOnceAWeek',
 		'0 0 1,15 * *' => 'la_opt_CronTwiceAMonth',
 		'0 0 1 * *' => 'la_opt_CronOnceAMonth',
 		'0 0 1 1 *' => 'la_opt_CronOnceAYear',
 	);
 
 	protected $minuteSettings = Array (
 		'*' => 'la_opt_CronEveryMinute',
 		'*/2' => 'la_opt_CronEveryOtherMinute',
 		'*/5' => 'la_opt_CronEveryFiveMinutes',
 		'*/10' => 'la_opt_CronEveryTenMinutes',
 		'*/15' => 'la_opt_CronEveryFifteenMinutes',
 		'0,30' => 'la_opt_CronEveryThirtyMinutes',
 		'--' => 'la_opt_CronMinutes',
 		// minutes added dynamically later
 	);
 
 	protected $hourSettings = Array (
 		'*' => 'la_opt_CronEveryHour',
 		'*/2' => 'la_opt_CronEveryOtherHour',
 		'*/3' => 'la_opt_CronEveryThreeHours',
 		'*/4' => 'la_opt_CronEveryFourHours',
 		'*/6' => 'la_opt_CronEverySixHours',
 		'0,12' => 'la_opt_CronEveryTwelveHours',
 		'--' => 'la_opt_CronHours',
 		// hours added dynamically later
 	);
 
 	protected $daySettings = Array (
 		'*' => 'la_opt_CronEveryDay',
 		'*/2' => 'la_opt_CronEveryOtherDay',
 		'1,15' => 'la_opt_CronTwiceAMonth',
 		'--' => 'la_opt_CronDays',
 		// days added dynamically later
 	);
 
 	protected $monthSettings = Array (
 		'*' => 'la_opt_CronEveryMonth',
 		'*/2' => 'la_opt_CronEveryOtherMonth',
 		'*/4' => 'la_opt_CronEveryThreeMonths',
 		'1,7' => 'la_opt_CronEverySixMonths',
 		'--' => 'la_opt_CronMonths',
 		'1' => 'la_opt_January',
 		'2' => 'la_opt_February',
 		'3' => 'la_opt_March',
 		'4' => 'la_opt_April',
 		'5' => 'la_opt_May',
 		'6' => 'la_opt_June',
 		'7' => 'la_opt_July',
 		'8' => 'la_opt_August',
 		'9' => 'la_opt_September',
 		'10' => 'la_opt_October',
 		'11' => 'la_opt_November',
 		'12' => 'la_opt_December',
 	);
 
 	protected $weekdaySettings = Array (
 		'*' => 'la_opt_CronEveryWeekday',
 		'1-5' => 'la_opt_CronMondayThroughFriday',
 		'0,6' => 'la_opt_CronSaturdayAndSunday',
 		'1,3,5' => 'la_opt_CronMondayWednesdayAndFriday',
 		'2,4' => 'la_opt_CronTuesdayAndThursday',
 		'--' => 'la_opt_CronWeekdays',
 		'0' => 'la_opt_Sunday',
 		'1' => 'la_opt_Monday',
 		'2' => 'la_opt_Tuesday',
 		'3' => 'la_opt_Wednesday',
 		'4' => 'la_opt_Thursday',
 		'5' => 'la_opt_Friday',
 		'6' => 'la_opt_Saturday',
 	);
 
 	/**
 	 * Returns possible field options by type
 	 *
 	 * @param int $field_type
 	 * @return Array
 	 */
 	public function getOptions($field_type)
 	{
 		$mapping = Array (
 			self::COMMON => $this->commonSettings,
 			self::MINUTE => $this->minuteSettings,
 			self::HOUR => $this->hourSettings,
 			self::DAY => $this->daySettings,
 			self::MONTH => $this->monthSettings,
 			self::WEEKDAY => $this->weekdaySettings,
 		);
 
+		/** @var Array $ret */
 		$ret = $mapping[$field_type];
-		/* @var $ret Array */
 
 		foreach ($ret as $option_key => $option_title) {
 			$option_title = substr($option_title, 0, 1) == '+' ? substr($option_title, 1) : $this->Application->Phrase($option_title);
 			$ret[$option_key] = $option_title;
 
 			if ( "$option_key" !== '--' ) {
 				$ret[$option_key] .= ' (' . $option_key . ')';
 			}
 		}
 
 		if ( $field_type == self::MINUTE ) {
 			for ($i = 0; $i <= 59; $i++) {
 				$ret[$i] = ':' . str_pad($i, 2, '0', STR_PAD_LEFT) . ' (' . $i . ')';
 			}
 		}
 		elseif ( $field_type == self::HOUR ) {
+			/** @var LanguagesItem $language */
 			$language = $this->Application->recallObject('lang.current');
-			/* @var $language LanguagesItem */
 
 			$short_time_format = str_replace(':s', '', $language->GetDBField('TimeFormat'));
 
 			for ($i = 0; $i <= 23; $i++) {
 				$ret[$i] = date($short_time_format, mktime($i, 0, 0)) . ' (' . $i . ')';
 			}
 		}
 		elseif ( $field_type == self::DAY ) {
+			/** @var kMultiLanguageHelper $ml_helper */
 			$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
-			/* @var $ml_helper kMultiLanguageHelper */
 
 			$forms = Array (
 				'phrase1' => 'la_NumberSuffixSt', 'phrase2' => 'la_NumberSuffixNd', 'phrase3' => 'la_NumberSuffixRd',
 				'phrase4' => 'la_NumberSuffixTh', 'phrase5' => 'la_NumberSuffixTh'
 			);
 
 			for ($i = 1; $i <= 31; $i++) {
 				$ret[$i] = $i . $ml_helper->getPluralPhrase($i, $forms) . ' (' . $i . ')';
 			}
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Returns field name by type
 	 *
 	 * @param int $field_type
 	 * @param string $field_prefix
 	 * @return string
 	 * @access protected
 	 */
 	protected function _getFieldNameByType($field_type, $field_prefix)
 	{
 		$field_mapping = Array (
 			self::MINUTE => 'Minute',
 			self::HOUR => 'Hour',
 			self::DAY => 'Day',
 			self::MONTH => 'Month',
 			self::WEEKDAY => 'Weekday',
 		);
 
 		return $field_prefix . $field_mapping[$field_type];
 	}
 
 	/**
 	 * Creates virtual fields for given unit
 	 *
 	 * @param string $prefix
 	 * @param string $field_prefix
 	 * @return void
 	 * @access public
 	 */
 	public function initUnit($prefix, $field_prefix = '')
 	{
 		$config = $this->Application->getUnitConfig($prefix);
 
 		$config->addVirtualFields(Array (
 			$field_prefix . 'CommonHints' => Array (
 				'type' => 'string',
 				'formatter' => 'kOptionsFormatter', 'options' => $this->getOptions(self::COMMON),
 				'default' => ''
 			),
 		));
 
 		foreach ($this->fieldTypes as $field_type) {
 			$field_name = $this->_getFieldNameByType($field_type, $field_prefix);
 
 			$config->addVirtualFields(Array (
 				$field_name => Array ('type' => 'string', 'max_len' => 30, 'default' => '*'),
 				$field_name . 'Hints' => Array (
 					'type' => 'string',
 					'formatter' => 'kOptionsFormatter', 'options' => $this->getOptions($field_type),
 					'default' => ''
 				),
 			));
 		}
 	}
 
 	/**
 	 * Loads schedule values from database into virtual fields
 	 *
 	 * @param kDBItem $object
 	 * @param string $field_prefix
 	 */
 	public function load(kDBItem $object, $field_prefix = '')
 	{
 		$combined_value = explode(' ', $object->GetDBField($field_prefix));
 
 		foreach ($this->fieldTypes as $field_type) {
 			$field_name = $this->_getFieldNameByType($field_type, $field_prefix);
 			$object->SetDBField($field_name, $combined_value[$field_type - 1]);
 		}
 	}
 
 	/**
 	 * Validates schedule values and saves them to database
 	 *
 	 * @param kDBItem $object
 	 * @param string $field_prefix
 	 * @return bool
 	 * @access public
 	 */
 	public function validateAndSave(kDBItem $object, $field_prefix = '')
 	{
 		$validated = true;
 		$combined_value = Array ();
 		$cron_field = new kCronField();
 
 		foreach ($this->fieldTypes as $field_type) {
 			$field_name = $this->_getFieldNameByType($field_type, $field_prefix);
 			$value = preg_replace('/\s+/s', '', mb_strtoupper($object->GetDBField($field_name)));
 
 			if ( $cron_field->validate($field_type, $value) ) {
 				$object->SetDBField($field_name, $value);
 			}
 			else {
 				$validated = false;
 				$object->SetError($field_name, 'invalid_format');
 			}
 
 			$combined_value[$field_type] = $value;
 		}
 
 		ksort($combined_value);
 		$object->SetDBField($field_prefix, implode(' ', $combined_value));
 
 		return $validated;
 	}
 
 	/**
 	 * Replaces aliases in the field
 	 *
 	 * @param int $field_type
 	 * @param string $value
 	 * @return string
 	 * @access public
 	 */
 	public static function replaceAliases($field_type, $value)
 	{
 		$replacements = Array ();
 		$value = mb_strtolower($value);
 
 		if ( $field_type == self::MONTH ) {
 			$replacements = Array (
 				'jan' => 1, 'feb' => 2, 'mar' => 3, 'apr' => 4, 'may' => 5, 'jun' => 6,
 				'jul' => 7, 'aug' => 8, 'sep' => 9, 'oct' => 10, 'nov' => 11, 'dec' => 12,
 			);
 		}
 		elseif ( $field_type == self::WEEKDAY ) {
 			$replacements = Array ('sun' => 0, 'mon' => 1, 'tue' => 2, 'wed' => 3, 'thu' => 4, 'fri' => 5, 'sat' => 6);
 		}
 
 		if ( $replacements ) {
 			$value = str_replace(array_keys($replacements), array_values($replacements), $value);
 		}
 
 		return $value;
 	}
 
 	/**
 	 * Returns next (after given one or now) timestamp matching given cron expression
 	 *
 	 * @param string $expression
 	 * @param int $date
 	 * @param bool $inverse
 	 * @param bool $allow_current_date
 	 * @return int
 	 * @access public
 	 * @throws RuntimeException
 	 */
 	public function getMatch($expression, $date = NULL, $inverse = false, $allow_current_date = false)
 	{
 		if ( !isset($date) ) {
 			$date = TIMENOW;
 		}
 
 		$next_run = strtotime('-' . (int)date('s', $date) . ' seconds', $date);
 		$expression_parts = explode(' ', $expression);
 
 		$cron_field = new kCronField();
 
 		// set a hard limit to bail on an impossible date
 		for ($i = 0; $i < 1000; $i++) {
 			foreach ($this->fieldTypes as $field_type) {
 				$matched = false;
 				$part = $expression_parts[$field_type - 1];
 
 				// check if this is singular or a list
 				if ( strpos($part, ',') === false ) {
 					$matched = $cron_field->match($field_type, $next_run, $part);
 				}
 				else {
 					$rules = explode(',', $part);
 
 					foreach ($rules as $rule) {
 						if ( $cron_field->match($field_type, $next_run, $rule) ) {
 							$matched = true;
 							break;
 						}
 					}
 				}
 
 				// if the field is not matched, then start over
 				if ( !$matched ) {
 					$next_run = $cron_field->increment($field_type, $next_run, $inverse);
 					continue 2;
 				}
 			}
 
 			// Skip this match if needed
 			if ( (!$allow_current_date && $next_run == $date) ) {
 				$next_run = $cron_field->increment(self::MINUTE, $next_run, $inverse);
 				continue;
 			}
 
 			return $next_run;
 		}
 
 		throw new RuntimeException('Impossible CRON expression');
 	}
 }
 
 
 class kCronField extends kBase {
 
 	/**
 	 * Validates field value
 	 *
 	 * @param int $field_type
 	 * @param string $value
 	 * @param bool $asterisk_allowed
 	 * @return bool
 	 * @access public
 	 */
 	public function validate($field_type, $value, $asterisk_allowed = true)
 	{
 		$rules = explode(',', kCronHelper::replaceAliases($field_type, $value));
 
 		foreach ($rules as $rule) {
 			if ( $this->_isIncrementRule($rule) ) {
 				if ( !$this->_validateIncrementRule($field_type, $rule) ) {
 					return false;
 				}
 			}
 			elseif ( $this->_isRangeRule($rule) ) {
 				if ( !$this->_validateRangeRule($field_type, $rule) ) {
 					return false;
 				}
 			}
 			elseif ( !$this->_validateNumberRule($field_type, $rule, $asterisk_allowed) ) {
 				return false;
 			}
 		}
 
 		return true;
 	}
 
 	/**
 	 * Determines if expression is range
 	 *
 	 * @param string $rule
 	 * @return bool
 	 * @access protected
 	 */
 	protected function _isRangeRule($rule)
 	{
 		return strpos($rule, '-') !== false;
 	}
 
 	/**
 	 * Validates range rule
 	 *
 	 * @param int $field_type
 	 * @param string $rule
 	 * @return bool
 	 * @access protected
 	 */
 	protected function _validateRangeRule($field_type, $rule)
 	{
 		$parts = explode('-', $rule);
 
 		if ( count($parts) != 2 ) {
 			return false;
 		}
 
 		$min_value = $parts[0];
 		$max_value = $parts[1];
 
 		if ( !$this->_validateNumberRule($field_type, $min_value) || !$this->_validateNumberRule($field_type, $max_value) || $min_value >= $max_value ) {
 			return false;
 		}
 
 		return true;
 	}
 
 	/**
 	 * Determines if expression is increment
 	 *
 	 * @param string $rule
 	 * @return bool
 	 * @access protected
 	 */
 	protected function _isIncrementRule($rule)
 	{
 		return strpos($rule, '/') !== false;
 	}
 
 	/**
 	 * Validates increment rule
 	 *
 	 * @param int $field_type
 	 * @param string $rule
 	 * @return bool
 	 * @access protected
 	 */
 	protected function _validateIncrementRule($field_type, $rule)
 	{
 		$parts = explode('/', $rule);
 
 		if ( count($parts) != 2 ) {
 			return false;
 		}
 
 		$interval = $parts[0];
 		$increment = $parts[1];
 
 		if ( $this->_isRangeRule($interval) ) {
 			if ( !$this->_validateRangeRule($field_type, $interval) ) {
 				return false;
 			}
 		}
 		elseif ( !$this->_validateNumberRule($field_type, $interval, true) ) {
 			return false;
 		}
 
 		if ( !$this->_validateNumberRule($field_type, $increment) ) {
 			return false;
 		}
 
 		return true;
 	}
 
 	/**
 	 * Validates, that number within range OR an asterisk is given
 	 *
 	 * @param int $field_type
 	 * @param string $rule
 	 * @param bool $asterisk_allowed
 	 * @return bool
 	 * @access protected
 	 */
 	protected function _validateNumberRule($field_type, $rule, $asterisk_allowed = false)
 	{
 		if ( "$rule" === '*' ) {
 			return $asterisk_allowed;
 		}
 
 		$int_rule = (int)$rule;
 
 		if ( !is_numeric($rule) || "$int_rule" !== "$rule" ) {
 			// not integer
 			return false;
 		}
 
 		$range_mapping = Array (
 			kCronHelper::MINUTE => Array ('from' => 0, 'to' => 59),
 			kCronHelper::HOUR => Array ('from' => 0, 'to' => 23),
 			kCronHelper::DAY => Array ('from' => 1, 'to' => 31),
 			kCronHelper::MONTH => Array ('from' => 1, 'to' => 12),
 			kCronHelper::WEEKDAY => Array ('from' => 0, 'to' => 7),
 		);
 
 		return $int_rule >= $range_mapping[$field_type]['from'] && $int_rule <= $range_mapping[$field_type]['to'];
 	}
 
 	/**
 	 * Tries to match given date to given expression
 	 *
 	 * @param int $field_type
 	 * @param int $date
 	 * @param string $rule
 	 * @return bool
 	 * @access public
 	 */
 	public function match($field_type, $date, $rule)
 	{
 		$date_part = $this->_getDatePart($field_type, $date, $rule);
 
 		if ( $this->_isIncrementRule($rule) ) {
 			return $this->_isInIncrement($date_part, $rule);
 		}
 		elseif ( $this->_isRangeRule($rule) ) {
 			return $this->_isInRange($date_part, $rule);
 		}
 
 		return $rule == '*' || $date_part == $rule;
 	}
 
 	/**
 	 * Returns only part, needed based on field type of date in timestamp
 	 *
 	 * @param int $field_type
 	 * @param int $date
 	 * @param string $rule
 	 * @return int
 	 * @access protected
 	 */
 	protected function _getDatePart($field_type, $date, $rule)
 	{
 		$mapping = Array (
 			kCronHelper::MINUTE => 'i',
 			kCronHelper::HOUR => 'G',
 			kCronHelper::DAY => 'j',
 			kCronHelper::MONTH => 'n',
 			kCronHelper::WEEKDAY => 'N',
 		);
 
 		if ( $field_type == kCronHelper::WEEKDAY ) {
 			// Test to see which Sunday to use -- 0 == 7 == Sunday
 			$mapping[$field_type] = in_array(7, str_split($rule)) ? 'N' : 'w';
 		}
 
 		return (int)date($mapping[$field_type], $date);
 	}
 
 	/**
 	 * Test if a value is within a range
 	 *
 	 * @param string $date_value Set date value
 	 * @param string $rule Value to test
 	 * @return bool
 	 * @access protected
 	 */
 	protected function _isInRange($date_value, $rule)
 	{
 		$parts = array_map('trim', explode('-', $rule, 2));
 
 		return $date_value >= $parts[0] && $date_value <= $parts[1];
 	}
 
 	/**
 	 * Test if a value is within an increments of ranges (offset[-to]/step size)
 	 *
 	 * @param string $date_value Set date value
 	 * @param string $rule Value to test
 	 * @return bool
 	 * @access protected
 	 */
 	protected function _isInIncrement($date_value, $rule)
 	{
 		$parts = array_map('trim', explode('/', $rule, 2));
 		$stepSize = isset($parts[1]) ? $parts[1] : 0;
 
 		if ( $parts[0] == '*' || $parts[0] == 0 ) {
 			return (int)$date_value % $stepSize == 0;
 		}
 
 		$range = explode('-', $parts[0], 2);
 		$offset = $range[0];
 		$to = isset($range[1]) ? $range[1] : $date_value;
 
 		// Ensure that the date value is within the range
 		if ( $date_value < $offset || $date_value > $to ) {
 			return false;
 		}
 
 		for ($i = $offset; $i <= $to; $i += $stepSize) {
 			if ( $i == $date_value ) {
 				return true;
 			}
 		}
 
 		return false;
 	}
 
 	/**
 	 * Increments/decrements given date for 1 unit based on field type
 	 *
 	 * @param int $field_type
 	 * @param int $date
 	 * @param bool $inverse
 	 * @return int
 	 * @access public
 	 */
 	public function increment($field_type, $date, $inverse = false)
 	{
 		$mapping = Array (
 			kCronHelper::MINUTE => '1 minute',
 			kCronHelper::HOUR => '1 hour',
 			kCronHelper::DAY => '1 day',
 			kCronHelper::MONTH => '1 month',
 			kCronHelper::WEEKDAY => '1 day',
 		);
 
 		return $this->_resetTime($field_type, strtotime(($inverse ? '-' : '+') . $mapping[$field_type], $date), $inverse);
 	}
 
 	/**
 	 * Resets time based on field type
 	 *
 	 * @param int $field_type
 	 * @param int $date
 	 * @param bool $inverse
 	 * @return int
 	 * @access public
 	 */
 	protected function _resetTime($field_type, $date, $inverse = false)
 	{
 		if ( $field_type == kCronHelper::MONTH || $field_type == kCronHelper::WEEKDAY || $field_type == kCronHelper::DAY ) {
 			if ( $inverse ) {
 				$date = strtotime(date('Y-m-d 23:59:59', $date));
 				// set time 23:59:00
 			}
 			else {
 				// set time 00:00:00
 				$date = strtotime(date('Y-m-d 00:00:00', $date));
 			}
 		}
 		elseif ( $field_type == kCronHelper::HOUR ) {
 			if ( $inverse ) {
 				// set time <current_hour>:59:00
 				$date = strtotime(date('Y-m-d H:59:59', $date));
 			}
 			else {
 				// set time <current_hour>:00:00
 				$date = strtotime(date('Y-m-d H:00:00', $date));
 			}
 		}
 
 		return $date;
 	}
 }
\ No newline at end of file
Index: branches/5.3.x/core/units/helpers/filenames_helper.php
===================================================================
--- branches/5.3.x/core/units/helpers/filenames_helper.php	(revision 16518)
+++ branches/5.3.x/core/units/helpers/filenames_helper.php	(revision 16519)
@@ -1,186 +1,186 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class kFilenamesHelper extends kHelper {
 
 	/**
 	 * Character, that should replace disallowed symbols in filename
 	 *
 	 * @var string
 	 */
 	var $_escapeChar = '_';
 
 	/**
 	 * Sequences, that should be replaced with mathing sequences from _filenameReplaceTo property
 	 *
 	 * @var Array
 	 */
 	var $_filenameReplaceFrom = Array ();
 
 	/**
 	 * Sequences, that will replace matching sequences from _filenameReplaceFrom property
 	 *
 	 * @var Array
 	 */
 	var $_filenameReplaceTo = Array ();
 
 
 	public function __construct()
 	{
 		parent::__construct();
 
 		$this->_escapeChar = $this->Application->ConfigValue('FilenameSpecialCharReplacement');
 
+		/** @var kDBItem $language */
 		$language = $this->Application->recallObject('lang.primary');
-		/* @var $language kDBItem */
 
 		$replacements = $language->GetDBField('FilenameReplacements');
 		if ($replacements) {
 			$replacements = explode("\r\n", $replacements);
 			foreach ($replacements as $replacement) {
 				list ($replace_from, $replace_to) = explode('=', $replacement);
 				$this->_filenameReplaceFrom[] = trim($replace_from);
 				$this->_filenameReplaceTo[] = trim($replace_to);
 			}
 		}
 	}
 
 	function replaceSequences($filename)
 	{
 		$not_allowed = Array (
 			' ', '\\', '/', ':', '*', '?', '"', '<', '>', '|', '`',
 			'~', '!', '@', '#', '$', '%', '^', '&', '(', ')', '~',
 			'+', '=', '-', '{', '}', ']', '[', "'", ';', '.', ',', "\r", "\n"
 		);
 
 		if ($this->_filenameReplaceFrom) {
 			// replace predefined sequences
 			$filename = str_replace($this->_filenameReplaceFrom, $this->_filenameReplaceTo, $filename);
 		}
 
 		$filename = str_replace($not_allowed, $this->_escapeChar, $filename);
 		$filename = preg_replace('/(' . $this->_escapeChar . '+)/', $this->_escapeChar, $filename);
 		return trim($filename, $this->_escapeChar); // remove trailing escape chars
 	}
 
 	/**
 	 * Replace not allowed symbols with "_" chars + remove duplicate "_" chars in result
 	 *
 	 * @param string $table
 	 * @param string $id_field
 	 * @param int $item_id
 	 * @param string $filename
 	 * @return string
 	 */
 	function stripDisallowed($table, $id_field, $item_id, $filename)
 	{
 		$filename = $this->replaceSequences($filename);
 
 		return $this->checkAutoFilename($table, $id_field, $item_id, $filename);
 	}
 
 	function checkAutoFilename($table, $id_field, $item_id, $filename)
 	{
 		if (!$filename) {
 			return $filename;
 		}
 
 		$item_id = !$item_id ? 0 : $item_id;
 
 		if ( $this->Application->GetLiveName($table) == TABLE_PREFIX.'CategoryItems' ) {
 			$sql_mask = '	SELECT CategoryId
 							FROM %1$s
 							WHERE ItemResourceId = %2$s';
 
 			$item_categories_cur = $this->Conn->GetCol( sprintf($sql_mask, $table, $item_id) );
 
 			if ( $this->Application->IsTempTable($table) ) {
 				$item_categories_live = $this->Conn->GetCol( sprintf($sql_mask, $this->Application->GetLiveName($table), $item_id) );
 			}
 			else {
 				$item_categories_live = Array ();
 			}
 
 			$item_categories = array_unique(array_merge($item_categories_cur, $item_categories_live));
 
 			if (!$item_categories) {
 				$item_categories = Array( $this->Application->GetVar('m_cat_id') ); // this may happen when creating new item
 			}
 
 			$cat_filter = ' AND CategoryId IN (' . implode(',', $item_categories) . ')';
 		}
 		else {
 			$cat_filter = '';
 		}
 
 		// check current table (temp or live)
 		$sql_mask = '	SELECT ' . $id_field . '
 						FROM %1$s
 						WHERE Filename = ' . $this->Conn->qstr($filename) . $cat_filter;
 		$found_temp_ids = $this->Conn->GetCol( sprintf($sql_mask, $table) );
 
 		// check live table if current is temp
 		if ( $this->Application->IsTempTable($table) ) {
 			$found_live_ids = $this->Conn->GetCol( sprintf($sql_mask, $this->Application->GetLiveName($table)) );
 		}
 		else {
 			$found_live_ids = Array ();
 		}
 
 		$found_item_ids = array_unique( array_merge($found_temp_ids, $found_live_ids) );
 
 		$has_page = preg_match('/(.*)_([\d]+)([a-z]*)$/', $filename, $rets);
 
 		$duplicates_found = (count($found_item_ids) > 1) || ($found_item_ids && $found_item_ids[0] != $item_id);
 		if ($duplicates_found || $has_page) {// other category has same filename as ours OR we have filename, that ends with _number
 			$append = $duplicates_found ? $this->_escapeChar . 'a' : '';
 
 			if ($has_page) {
 				$filename = $rets[1].'_'.$rets[2];
 				$append = $rets[3] ? $rets[3] : $this->_escapeChar . 'a';
 			}
 
 			// check live & temp table
 			$sql_cur = 'SELECT ' . $id_field . '
 						FROM ' . $table . '
 						WHERE (Filename = %s) AND (' . $id_field . ' != ' . $item_id . ')' . $cat_filter;
 
 			if ( $this->Application->IsTempTable($table) ) {
 				$sql_live = '	SELECT ' . $id_field . '
 								FROM ' . $this->Application->GetLiveName($table) . '
 								WHERE (Filename = %s) AND (' . $id_field . ' != ' . $item_id . ')' . $cat_filter;
 			}
 			else {
 				$sql_live = false;
 			}
 
 			while ( $this->Conn->GetOne( sprintf($sql_cur, $this->Conn->qstr($filename.$append)) ) > 0 ||
 							(	$sql_live
 								&&
 								( $this->Conn->GetOne( sprintf($sql_live, $this->Conn->qstr($filename.$append)) ) > 0 )
 							)
 						)
 			{
 				if (mb_substr($append, -1) == 'z') $append .= 'a';
 				$append = mb_substr($append, 0, mb_strlen($append) - 1) . chr( ord( mb_substr($append, -1) ) + 1 );
 			}
 
 			return $filename.$append;
 		}
 
 		return $filename;
 	}
 }
\ No newline at end of file
Index: branches/5.3.x/core/units/helpers/captcha_helper.php
===================================================================
--- branches/5.3.x/core/units/helpers/captcha_helper.php	(revision 16518)
+++ branches/5.3.x/core/units/helpers/captcha_helper.php	(revision 16519)
@@ -1,185 +1,185 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class kCaptchaHelper extends kHelper {
 
 	var $width;
 	var $height;
 
 	function GenerateCaptchaCode($len = 5)
 	{
 		$chars = '1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
 		$s = '';
 		for ($i = 0; $i < $len; $i++) {
 			$s .= $chars[ rand(0, strlen($chars)-1) ];
 		}
 		return $s;
 	}
 
 	function graphics($w, $h)
 	{
 		$this->width = $w;
 		$this->height = $h;
 	}
 
 	function GenerateCaptchaImage($rand, $width, $height, $filter_blur = false)
 	{
 		global $site_font_path;
 		global $site_font_validation;
 
 		$image = imagecreate($width, $height);
 		$bgColor = imagecolorallocate ($image, 255, 255, 255);
 		$textColor = imagecolorallocate ($image, 0, 0, 0);
 
 		// add random noise
 		for ($i = 0; $i < 20; $i++) {
 			$rx1 = rand(0, $width);
 			$rx2 = rand(0, $width);
 			$ry1 = rand(0, $height);
 			$ry2 = rand(0, $height);
 			$rcVal = rand(0, 255);
 			$rc1 = imagecolorallocate($image, rand(0, 255), rand(0, 255), rand(100, 255));
 			imageline($image, $rx1, $ry1, $rx2, $ry2, $rc1);
 		}
 
 		// write the random number
 
 		$dimensions = imagettfbbox($height*0.75, 0, KERNEL_PATH.'/fonts/monofont.ttf', $rand );
 
 		imagettftext($image, $height*0.75, 0, floor(($width - $dimensions[4])/2),  floor(($height - $dimensions[5])/2), $textColor, KERNEL_PATH.'/fonts/monofont.ttf', $rand);
 
 		//		$font = imageloadfont(KERNEL_PATH.'/fonts/monofont.ttf');
 		//		imagestring($image, $font, 3, 0, $rand, $textColor);
 
 		if ($filter_blur) $this->blur($image, 3);
 
 		// send several headers to make sure the image is not cached
 		// date in the past
 		header("Expires: Mon, 23 Jul 1993 05:00:00 GMT");
 
 		// always modified
 		header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
 
 		// HTTP/1.1
 		header("Cache-Control: no-store, no-cache, must-revalidate");
 		header("Cache-Control: post-check=0, pre-check=0", false);
 
 		// HTTP/1.0
 		header("Pragma: no-cache");
 
 		// send the content type header so the image is displayed properly
 		header('Content-type: image/jpeg');
 
 		imagejpeg($image);
 		imagedestroy($image);
 	}
 
 	function blur(&$gdimg, $radius = 5.0)
 	{
 		// Taken from Torstein Hønsi's phpUnsharpMask (see phpthumb.unsharp.php)
 		$radius = round(max(0, min($radius, 50)) * 2);
 		if (!$radius) {
 			return false;
 		}
 
 		$w = ImageSX($gdimg);
 		$h = ImageSY($gdimg);
 		$imgBlur = ImageCreateTrueColor($w, $h);
 
 		if ($imgBlur) {
 			// Gaussian blur matrix:
 			//    1    2    1
 			//    2    4    2
 			//    1    2    1
 
 			// Move copies of the image around one pixel at the time and merge them with weight
 			// according to the matrix. The same matrix is simply repeated for higher radii.
 			for ($i = 0; $i < $radius; $i++)    {
 				ImageCopy     ($imgBlur, $gdimg, 0, 0, 1, 1, $w - 1, $h - 1);            // up left
 				ImageCopyMerge($imgBlur, $gdimg, 1, 1, 0, 0, $w,     $h,     50.00000);  // down right
 				ImageCopyMerge($imgBlur, $gdimg, 0, 1, 1, 0, $w - 1, $h,     33.33333);  // down left
 				ImageCopyMerge($imgBlur, $gdimg, 1, 0, 0, 1, $w,     $h - 1, 25.00000);  // up right
 				ImageCopyMerge($imgBlur, $gdimg, 0, 0, 1, 0, $w - 1, $h,     33.33333);  // left
 				ImageCopyMerge($imgBlur, $gdimg, 1, 0, 0, 0, $w,     $h,     25.00000);  // right
 				ImageCopyMerge($imgBlur, $gdimg, 0, 0, 0, 1, $w,     $h - 1, 20.00000);  // up
 				ImageCopyMerge($imgBlur, $gdimg, 0, 1, 0, 0, $w,     $h,     16.666667); // down
 				ImageCopyMerge($imgBlur, $gdimg, 0, 0, 0, 0, $w,     $h,     50.000000); // center
 				ImageCopy     ($gdimg, $imgBlur, 0, 0, 0, 0, $w,     $h);
 			}
 
 			return true;
 		}
 
 		return false;
 	}
 
 	/**
 	 * Generates captcha code for showing on form
 	 *
 	 * @param string $variable_name
 	 */
 	function prepareCode($variable_name)
 	{
 		if ($this->Application->isAdmin || $this->Application->RecallVar($variable_name)) {
 			// when code found don't generate it 2nd time
 			return $this->Application->RecallVar($variable_name);
 		}
 
 		$code = $this->GenerateCaptchaCode();
 		$this->Application->StoreVar($variable_name, $code);
 
 		return $code;
 	}
 
 	/**
 	 * Validates captcha code on form
 	 *
 	 * @param kEvent $event
 	 * @param bool $check_request
 	 * @return bool
 	 */
 	function validateCode($event, $check_request = true)
 	{
 		if ($this->Application->isAdmin) {
 			// no captcha codes in admin
 			return true;
 		}
 
 		if ($check_request) {
 			// perform validation only when field is found on form
 			list ($id, $field_values) = each($this->Application->GetVar($event->getPrefixSpecial()));
 			if (!array_key_exists('Captcha', $field_values)) {
 				// when captcha code not submitted
 				return true;
 			}
 		}
 
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		$valid_code = $this->Application->RecallVar($event->getPrefixSpecial() . '_captcha_code');
 
 		if (!$object->GetDBField('Captcha') || ($object->GetDBField('Captcha') != $valid_code)) {
 			// empty code OR codes doesn't match
 			$object->SetError('Captcha', 'captcha_error', 'lu_captcha_error');
 
 			$this->Application->StoreVar($event->getPrefixSpecial() . '_captcha_code', $this->GenerateCaptchaCode());
 			return false;
 		}
 
 		return true;
 	}
 }
\ No newline at end of file
Index: branches/5.3.x/core/units/helpers/menu_helper.php
===================================================================
--- branches/5.3.x/core/units/helpers/menu_helper.php	(revision 16518)
+++ branches/5.3.x/core/units/helpers/menu_helper.php	(revision 16519)
@@ -1,487 +1,487 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class MenuHelper extends kHelper {
 
 		/**
 		 * Cached version of site menu
 		 *
 		 * @var Array
 		 * @access protected
 		 */
 		protected $Menu = NULL;
 
 		/**
 		 * Parent path mapping used in CachedMenu tag
 		 *
 		 * @var Array
 		 * @access protected
 		 */
 		protected $parentPaths = Array ();
 
 		/**
 		 * Extra parameters, that should be available in each menu item (key - param name, value - category field).
 		 *
 		 * @var array
 		 */
 		protected $itemParams = array(
 			// 'filename' => array('Filename'),
 			// 'created_on' => array('CreatedOn', '-- d/m/Y --'),
 		);
 
 		/**
 		 * Category dummy for formatting purposes.
 		 *
 		 * @var CategoriesItem
 		 */
 		protected $categoryDummy;
 
 		/**
 		 * Set's references to kApplication and DBConnection interface class instances
 		 *
 		 * @access public
 		 */
 		public function __construct()
 		{
 			parent::__construct();
 
 			if ( $this->menuItemsRequireFormatting() ) {
 				$this->categoryDummy = $this->Application->recallObject(
 					'c.menu-item',
 					null,
 					array('skip_autoload' => true)
 				);
 			}
 		}
 
 		/**
 		 * Builds site menu
 		 *
 		 * @param string $prefix_special
 		 * @param Array $params
 		 *
 		 * @return string
 		 * @access public
 		 */
 		public function menuTag($prefix_special, $params)
 		{
 			list ($menu, $root_path) = $this->_prepareMenu();
 			$cat = $this->_getCategoryId($params);
 
 			$parent_path = array_key_exists($cat, $this->parentPaths) ? $this->parentPaths[$cat] : '';
 			$parent_path = str_replace($root_path, '', $parent_path); // menu starts from module path
 
 			$levels = explode('|', trim($parent_path, '|'));
 
 			if ( $levels[0] === '' ) {
 				$levels = Array ();
 			}
 
 			if ( array_key_exists('level', $params) && $params['level'] > count($levels) ) {
 				// current level is deeper, then requested level
 				return '';
 			}
 
 			$level = max(array_key_exists('level', $params) ? $params['level'] - 1 : count($levels) - 1, 0);
 			$parent = array_key_exists($level, $levels) ? $levels[$level] : 0;
 
 			$cur_menu =& $menu;
 			$menu_path = array_slice($levels, 0, $level + 1);
 
 			foreach ($menu_path as $elem) {
 				$cur_menu =& $cur_menu['c' . $elem]['sub_items'];
 			}
 
 			$block_params = $this->prepareTagParams($prefix_special, $params);
 			$block_params['name'] = $params['render_as'];
 
 			$this->Application->SetVar('cur_parent_path', $parent_path);
 			$real_cat_id = $this->Application->GetVar('m_cat_id');
 
 			if ( !is_array($cur_menu) || !$cur_menu ) {
 				// no menus on this level
 				return '';
 			}
 
 			$ret = '';
 			$cur_item = 1;
 			$cur_menu = $this->_removeNonMenuItems($cur_menu);
 			$block_params['total_items'] = count($cur_menu);
 
 			foreach ($cur_menu as $page) {
 				$block_params = array_merge($block_params, $this->_prepareMenuItem($page, $real_cat_id, $root_path));
 
 				$block_params['is_last'] = $cur_item == $block_params['total_items'];
 				$block_params['is_first'] = $cur_item == 1;
 
 				$ret .= $this->Application->ParseBlock($block_params);
 				$cur_item++;
 			}
 
 			$this->Application->SetVar('m_cat_id', $real_cat_id);
 
 			return $ret;
 		}
 
 		/**
 		 * Builds cached menu version
 		 *
 		 * @return Array
 		 * @access protected
 		 */
 		protected function _prepareMenu()
 		{
 			static $root_cat = NULL, $root_path = NULL;
 
 			if ( !$root_cat ) {
 				$root_cat = $this->Application->getBaseCategory();
 				$cache_key = 'parent_paths[%CIDSerial:' . $root_cat . '%]';
 				$root_path = $this->Application->getCache($cache_key);
 
 				if ( $root_path === false ) {
 					$this->Conn->nextQueryCachable = true;
 					$sql = 'SELECT ParentPath
 							FROM ' . TABLE_PREFIX . 'Categories
 							WHERE CategoryId = ' . $root_cat;
 					$root_path = $this->Conn->GetOne($sql);
 					$this->Application->setCache($cache_key, $root_path);
 				}
 			}
 
 			if ( !$this->Menu ) {
 				if ( $this->Application->isCachingType(CACHING_TYPE_MEMORY) ) {
 					$menu = $this->Application->getCache('master:cms_menu', false, CacheSettings::$cmsMenuRebuildTime);
 				}
 				else {
 					$menu = $this->Application->getDBCache('cms_menu', CacheSettings::$cmsMenuRebuildTime);
 				}
 
 				if ( $menu ) {
 					$menu = unserialize($menu);
 					$this->parentPaths = $menu['parentPaths'];
 				}
 				else {
 					$menu = $this->_buildMenuStructure($root_cat);
 					$menu['parentPaths'] = $this->parentPaths;
 
 					if ( $this->Application->isCachingType(CACHING_TYPE_MEMORY) ) {
 						$this->Application->setCache('master:cms_menu', serialize($menu));
 					}
 					else {
 						$this->Application->setDBCache('cms_menu', serialize($menu));
 					}
 				}
 
 				unset($menu['parentPaths']);
 				$this->Menu = $menu;
 			}
 
 			return Array ($this->Menu, $root_path);
 		}
 
 		/**
 		 * Returns category id based tag parameters
 		 *
 		 * @param Array $params
 		 * @return int
 		 */
 		function _getCategoryId($params)
 		{
 			$cat = isset($params['category_id']) && $params['category_id'] != '' ? $params['category_id'] : $this->Application->GetVar('m_cat_id');
 
 			if ( "$cat" == 'parent' ) {
+				/** @var kDBItem $this_category */
 				$this_category = $this->Application->recallObject('c');
-				/* @var $this_category kDBItem */
 
 				$cat = $this_category->GetDBField('ParentId');
 			}
 			elseif ( $cat == 0 ) {
 				$cat = $this->Application->getBaseCategory();
 			}
 
 			return $cat;
 		}
 
 		/**
 		 * Prepares cms menu item block parameters
 		 *
 		 * @param Array $page
 		 * @param int $real_cat_id
 		 * @param string $root_path
 		 * @return Array
 		 * @access protected
 		 */
 		protected function _prepareMenuItem($page, $real_cat_id, $root_path)
 		{
 			static $language_id = NULL, $primary_language_id = NULL, $template = NULL;
 
 			if ( !isset($language_id) ) {
 				$language_id = $this->Application->GetVar('m_lang');
 				$primary_language_id = $this->Application->GetDefaultLanguageId();
 				$template = $this->Application->GetVar('t');
 			}
 
 			$active = $category_active = false;
 			$title = $page['l' . $language_id . '_ItemName'] ? $page['l' . $language_id . '_ItemName'] : $page['l' . $primary_language_id . '_ItemName'];
 
 			if ( $page['ItemType'] == 'cat' ) {
 				if ( array_key_exists($real_cat_id, $this->parentPaths) ) {
 					$active = strpos($this->parentPaths[$real_cat_id], $page['ParentPath']) !== false;
 				}
 				elseif ( $page['ItemPath'] == $template ) {
 					// physical template in menu
 					$active = true;
 				}
 
 				$category_active = $page['CategoryId'] == $real_cat_id;
 			}
 
 			/*if ( $page['ItemType'] == 'cat_index' ) {
 				$check_path = str_replace($root_path, '', $page['ParentPath']);
 				$active = strpos($parent_path, $check_path) !== false;
 			}
 
 			if ( $page['ItemType'] == 'page' ) {
 				$active = $page['ItemPath'] == preg_replace('/^Content\//i', '', $this->Application->GetVar('t'));
 			}*/
 
 			if ( substr($page['ItemPath'], 0, 3) == 'id:' ) {
 				// resolve ID path here, since it can be used directly without m_Link tag (that usually resolves it)
 				$page['ItemPath'] = $this->Application->getVirtualPageTemplate(substr($page['ItemPath'], 3));
 			}
 
 			$block_params = Array (
 				'title' => $title,
 				'template' => $page['ItemPath'],
 				'active' => $active,
 				'category_active' => $category_active, // new
 				'parent_path' => $page['ParentPath'],
 				'parent_id' => $page['ParentId'],
 				'cat_id' => $page['CategoryId'],
 				'item_type' => $page['ItemType'],
 				'page_id' => $page['ItemId'],
 				'use_section' => ($page['Type'] == PAGE_TYPE_TEMPLATE) && ($page['ItemPath'] != 'index'),
 				'has_sub_menu' => isset($page['sub_items']) && count($this->_removeNonMenuItems($page['sub_items'])) > 0,
 				'external_url' => $page['UseExternalUrl'] ? $page['ExternalUrl'] : false, // for backward compatibility
 				'menu_icon' => $page['UseMenuIconUrl'] ? $page['MenuIconUrl'] : false,
 			);
 
 			if ( isset($this->categoryDummy) ) {
 				$this->categoryDummy->SetDBFieldsFromHash($page);
 			}
 
 			foreach ( $this->itemParams as $param_name => $category_field_data ) {
 				$category_field_name = $category_field_data[0];
 
 				if ( array_key_exists(1, $category_field_data) ) {
 					$block_params[$param_name] = $this->categoryDummy->GetField(
 						$category_field_name,
 						$category_field_data[1]
 					);
 				}
 				else {
 					$block_params[$param_name] = $page[$category_field_name];
 				}
 			}
 
 			return $block_params;
 		}
 
 		/**
 		 * Returns only items, that are visible in menu
 		 *
 		 * @param Array $menu
 		 * @return Array
 		 * @access protected
 		 */
 		protected function _removeNonMenuItems($menu)
 		{
 			$theme_id = $this->Application->GetVar('m_theme');
 
 			foreach ($menu as $menu_index => $menu_item) {
 				// $menu_index is in "cN" format, where N is category id
 				if ( !$menu_item['IsMenu'] || $menu_item['Status'] != STATUS_ACTIVE || ($menu_item['ThemeId'] != $theme_id && $menu_item['ThemeId'] != 0) ) {
 					// don't show sections, that are not from menu OR system templates from other themes
 					unset($menu[$menu_index]);
 				}
 			}
 
 			return $menu;
 		}
 
 		/**
 		 * Builds cache of all menu items and their parent categories
 		 *
 		 * @param int $top_category_id
 		 * @return Array
 		 * @access protected
 		 */
 		protected function _buildMenuStructure($top_category_id)
 		{
 			// 1. get parent paths of leaf categories, that are in menu (across all themes)
 			$sql = 'SELECT ParentPath, CategoryId
 					FROM ' . $this->Application->getUnitConfig('c')->getTableName() . '
 					WHERE IsMenu = 1 AND Status = ' . STATUS_ACTIVE;
 			$this->parentPaths = $this->Conn->GetCol($sql ,'CategoryId');
 
 			// 2. figure out parent paths of all categories in path to leaf categories
 			foreach ($this->parentPaths as $leaf_parent_path) {
 				$parent_categories = explode('|', substr($leaf_parent_path, 1, -1));
 
 				foreach ($parent_categories as $index => $parent_category_id) {
 					if ( !isset($this->parentPaths[$parent_category_id]) ) {
 						$parent_path = array_slice($parent_categories, 0, $index + 1);
 						$this->parentPaths[$parent_category_id] = '|' . implode('|', $parent_path) . '|';
 					}
 				}
 			}
 
 			return $this->_altBuildMenuStructure($top_category_id, implode(',', array_keys($this->parentPaths)));
 		}
 
 		/**
 		 * Builds cache for children of given category (no matter, what menu status is)
 		 *
 		 * @param int $parent_category_id
 		 * @param string $category_limit
 		 * @return Array
 		 * @access protected
 		 */
 		protected function _altBuildMenuStructure($parent_category_id, $category_limit = NULL)
 		{
 			// Sub-categories from current category
 			$items = $this->_getSubCategories($parent_category_id, $category_limit);
 
 			// sort menu items
 			uasort($items, Array (&$this, '_menuSort'));
 
 			// process sub-menus of each menu
 			foreach ($items as $key => $menu_item) {
 				if ( $menu_item['CategoryId'] == $parent_category_id ) {
 					// don't process myself - prevents recursion
 					continue;
 				}
 
 				$sub_items = $this->_altBuildMenuStructure($menu_item['CategoryId'], $category_limit);
 
 				if ( $sub_items ) {
 					$items[$key]['sub_items'] = $sub_items;
 				}
 			}
 
 			return $items;
 		}
 
 		/**
 		 * Returns given category sub-categories
 		 *
 		 * @param int $parent_id
 		 * @param string $category_limit
 		 * @return Array
 		 * @access protected
 		 */
 		protected function _getSubCategories($parent_id, $category_limit = NULL)
 		{
 			static $items_by_parent = NULL, $lang_part = NULL;
 
 			if ( !isset($lang_part) ) {
+				/** @var kMultiLanguageHelper $ml_helper */
 				$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
-				/* @var $ml_helper kMultiLanguageHelper */
 
 				$lang_part = '';
 				$languages = $ml_helper->getLanguages();
 
 				foreach ($languages as $language_id) {
 					$lang_part .= 'c.l' . $language_id . '_MenuTitle AS l' . $language_id . '_ItemName,' . "\n";
 				}
 			}
 
 			if ( !isset($items_by_parent) ) {
 				$items_by_parent = Array ();
 				$extra_select_clause = '';
 
 				foreach ( $this->itemParams as $category_field_data ) {
 					$extra_select_clause .= ', c.' . $category_field_data[0];
 				}
 
 				// Sub-categories from current category
 				$sql = 'SELECT
 							c.CategoryId AS CategoryId,
 							CONCAT(\'c\', c.CategoryId) AS ItemId,
 							c.Priority AS ItemPriority,
 							' . $lang_part . '
 
 							IF(c.`Type` = ' . PAGE_TYPE_TEMPLATE . ', c.Template, CONCAT("id:", c.CategoryId)) AS ItemPath,
 							c.ParentPath AS ParentPath,
 							c.ParentId As ParentId,
 							\'cat\' AS ItemType,
 							c.IsMenu, c.Type, c.ThemeId, c.UseExternalUrl, c.ExternalUrl, c.UseMenuIconUrl, c.MenuIconUrl,
 							c.Status' . $extra_select_clause . '
 						FROM ' . TABLE_PREFIX . 'Categories AS c';
 
 				if ( isset($category_limit) && $category_limit ) {
 					$sql .= ' WHERE c.CategoryId IN (' . $category_limit . ')';
 				}
 
 				$items = $this->Conn->Query($sql, 'ItemId');
 
 				foreach ($items as $item_id => $item_data) {
 					$item_parent_id = $item_data['ParentId'];
 
 					if ( !array_key_exists($item_parent_id, $items_by_parent) ) {
 						$items_by_parent[$item_parent_id] = Array ();
 					}
 
 					$items_by_parent[$item_parent_id][$item_id] = $item_data;
 				}
 			}
 
 			return array_key_exists($parent_id, $items_by_parent) ? $items_by_parent[$parent_id] : Array ();
 		}
 
 		/**
 		 * Method for sorting pages by priority in descending order
 		 *
 		 * @param Array $a
 		 * @param Array $b
 		 * @return int
 		 */
 		function _menuSort($a, $b)
 		{
 			if ( $a['ItemPriority'] == $b['ItemPriority'] ) {
 				return 0;
 			}
 
 			return ($a['ItemPriority'] < $b['ItemPriority']) ? 1 : -1; // descending
 		}
 
 		/**
 		 * Determines if menu item parameters require formatting.
 		 *
 		 * @return boolean
 		 */
 		protected function menuItemsRequireFormatting()
 		{
 			foreach ( $this->itemParams as $category_field_data ) {
 				if ( array_key_exists(1, $category_field_data) ) {
 					return true;
 				}
 			}
 
 			return false;
 		}
 
 	}
Index: branches/5.3.x/core/units/helpers/backup_helper.php
===================================================================
--- branches/5.3.x/core/units/helpers/backup_helper.php	(revision 16518)
+++ branches/5.3.x/core/units/helpers/backup_helper.php	(revision 16519)
@@ -1,526 +1,526 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class BackupHelper extends kBase {
 
 	const SQL_ERROR_DURING_RESTORE = -3;
 
 	const FAILED_READING_BACKUP_FILE = -1;
 
 	/**
 	 * Backup 50 records per step
 	 */
 	const BACKUP_PER_STEP = 50;
 
 	/**
 	 * Restore 200 lines per step
 	 */
 	const RESTORE_PER_STEP = 200;
 
 	/**
 	 * Path, where backups are stored
 	 *
 	 * @var string
 	 */
 	protected $path = '';
 
 	public function __construct()
 	{
 		parent::__construct();
 
 		$this->path = $this->Application->ConfigValue('Backup_Path');
 	}
 
 	/**
 	 * Backup all data
 	 *
 	 * @return bool
 	 */
 	function initBackup()
 	{
+		/** @var FileHelper $file_helper */
 		$file_helper = $this->Application->recallObject('FileHelper');
-		/* @var $file_helper FileHelper */
 
 		if (!$file_helper->CheckFolder($this->path) || !is_writable($this->path)) {
 			$this->Application->SetVar('error_msg', $this->Application->Phrase('la_Text_backup_access'));
 
 			return false;
 		}
 
 		$tables = $this->_getBackupTables();
 
 		$backup_progress = Array (
 			'table_num' => 0,
 			'table_names' => $tables,
 			'table_count' => count($tables),
 			'record_count' => 0,
 			'file_name' => $this->getBackupFile( time() ),
 		);
 
 		$this->Application->RemoveVar('adm.backupcomplete_filename');
 		$this->Application->RemoveVar('adm.backupcomplete_filesize');
 
 		$fp = fopen($backup_progress['file_name'], 'a');
 
 		// write down module versions, used during backup
 		foreach ($this->Application->ModuleInfo as $module_name => $module_info) {
 			fwrite($fp, '# ' . $module_name . ' Version: ' . $module_info['Version'] . ";\n");
 		}
 
 		fwrite($fp, "#------------------------------------------\n\n");
 
 		// write down table structure
 		$out = Array ();
 
 		foreach ($tables as $table) {
 			$out[] = $this->_getCreateTableSql($table);
 		}
 
 		fwrite($fp, implode("\n", $out) . "\n");
 		fclose($fp);
 
 		$this->Application->StoreVar('adm.backup_status', serialize($backup_progress));
 
 		return true;
 	}
 
 	/**
 	 * Returns tables, that can be backed up
 	 *
 	 * @return Array
 	 * @access protected
 	 */
 	protected function _getBackupTables()
 	{
 		$ret = Array ();
 		$tables = $this->Conn->GetCol('SHOW TABLES LIKE "' . TABLE_PREFIX . '%"');
 
 		foreach ($tables as $table) {
 			if ( strpos($table, 'ses_') === false ) {
 				$ret[] = $table;
 			}
 		}
 
 		return $ret;
 	}
 
 	public function performBackup()
 	{
 		$backup_progress = unserialize($this->Application->RecallVar('adm.backup_status'));
 		$current_table = $backup_progress['table_names'][ $backup_progress['table_num'] ];
 
 		// get records
 		$a_records = $this->_getInsertIntoSql($current_table, $backup_progress['record_count'], self::BACKUP_PER_STEP);
 
 		if ( $a_records['num'] < self::BACKUP_PER_STEP ) {
 			$backup_progress['table_num']++;
 			$backup_progress['record_count'] = 0;
 		}
 		else {
 			$backup_progress['record_count'] += self::BACKUP_PER_STEP;
 		}
 
 		if ( $a_records['sql'] ) {
 			$fp = fopen($backup_progress['file_name'], 'a');
 			fwrite($fp, $a_records['sql']);
 			fclose($fp);
 		}
 
 		$percent = ($backup_progress['table_num'] / $backup_progress['table_count']) * 100;
 
 		if ( $percent >= 100 ) {
 			$percent = 100;
 			$this->Application->StoreVar('adm.backupcomplete_filename', $backup_progress['file_name']);
 			$this->Application->StoreVar('adm.backupcomplete_filesize', round(filesize($backup_progress['file_name']) / 1024 / 1024, 2)); // Mbytes
 		}
 		else {
 			$this->Application->StoreVar('adm.backup_status', serialize($backup_progress));
 		}
 
 		return round($percent);
 
 	}
 
 	/**
 	 * Returns sql, that will insert given amount of data into given table
 	 *
 	 * @param string $table
 	 * @param int $start
 	 * @param int $limit
 	 * @return Array
 	 * @access protected
 	 */
 	protected function _getInsertIntoSql($table, $start, $limit)
 	{
 		$sql = 'SELECT *
 				FROM ' . $table . '
 				' . $this->Conn->getLimitClause($start, $limit);
 	    $a_data = $this->Conn->Query($sql);
 
 		if ( !$a_data ) {
 			return Array ('num' => 0, 'sql' => '',);
 		}
 
 	    $ret = '';
 		$fields_sql = $this->_getFieldsSql( $a_data[0] );
 
 		foreach ($a_data AS $a_row) {
 			$values_sql = '';
 
 			foreach ($a_row as $field_value) {
 				$values_sql .= $this->Conn->qstr($field_value) . ',';
 			}
 
 			$values_sql = substr($values_sql, 0, -1);
 
 			$sql = 'INSERT INTO ' . $table . ' (' . $fields_sql . ') VALUES (' . $values_sql . ');';
 			$sql = str_replace("\n", "\\n", $sql);
 			$sql = str_replace("\r", "\\r", $sql);
 			$ret .= $sql . "\n";
 		}
 
 		if ( strlen(TABLE_PREFIX) ) {
 			$ret = str_replace('INSERT INTO ' . TABLE_PREFIX, 'INSERT INTO ', $ret);
 		}
 
 		return Array ('num' => count($a_data), 'sql' => $ret);
 	}
 
 	/**
 	 * Builds field list part of INSERT INTO statement based on given fields
 	 *
 	 * @param Array $row
 	 * @return string
 	 */
 	protected function _getFieldsSql($row)
 	{
 		$ret = '';
 		$a_fields = array_keys($row);
 
 	    foreach ($a_fields AS $field_name) {
 			$ret .= '`' . $field_name . '`,';
 	    }
 
 		return substr($ret, 0, -1);
 	}
 
 	/**
 	 * Returns sql, that will create given table
 	 *
 	 * @param string $table
 	 * @param string $crlf
 	 * @return string
 	 */
 	protected function _getCreateTableSql($table, $crlf = "\n")
 	{
 		$this->Conn->Query('SET SQL_QUOTE_SHOW_CREATE = 0');
 	    $tmp_res = $this->Conn->Query('SHOW CREATE TABLE ' . $table);
 
 		if ( !is_array($tmp_res) || !isset($tmp_res[0]) ) {
 			return '';
 		}
 
 		// add drop table & create table
 		$schema_create = 'DROP TABLE IF EXISTS ' . $table . ';' . $crlf;
 		$schema_create .= '# --------------------------------------------------------' . $crlf;
 		$schema_create .= str_replace("\n", $crlf, $tmp_res[0]['Create Table']);
 
 		// remove table prefix from dump
 		if ( strlen(TABLE_PREFIX) ) {
 			$schema_create = str_replace('DROP TABLE IF EXISTS ' . TABLE_PREFIX, 'DROP TABLE ', $schema_create);
 			$schema_create = str_replace('CREATE TABLE ' . TABLE_PREFIX, 'CREATE TABLE ', $schema_create);
 		}
 
 		// remove any table properties (e.g. auto-increment, collation, etc)
 		$last_brace_pos = strrpos($schema_create, ')');
 
 		if ( $last_brace_pos !== false ) {
 			$schema_create = substr($schema_create, 0, $last_brace_pos + 1);
 		}
 
 		$schema_create .= "\n# --------------------------------------------------------\n";
 
 	    return $schema_create;
 	}
 
 	public function initRestore()
 	{
 		$file = $this->getBackupFile();
 
 		$restoreProgress = Array (
 			'file_pos' => 0,
 			'file_name' => $file,
 			'file_size' => filesize($file),
 		);
 
 		$this->Application->RemoveVar('adm.restore_success');
 		$this->Application->StoreVar('adm.restore_status', serialize($restoreProgress));
 	}
 
 	/**
 	 * Restores part of backup file
 	 *
 	 * @return int
 	 * @access public
 	 */
 	public function performRestore()
 	{
 		$restore_progress = unserialize($this->Application->RecallVar('adm.restore_status'));
 		$filename = $restore_progress['file_name'];
 		$file_offset = $restore_progress['file_pos'];
 		$size = filesize($filename);
 
 		if ( $file_offset > $size ) {
 			return self::FAILED_READING_BACKUP_FILE;
 		}
 
 		$fp = fopen($filename, "r");
 		if ( !$fp ) {
 			return self::FAILED_READING_BACKUP_FILE;
 		}
 
 		if ( $file_offset > 0 ) {
 			fseek($fp, $file_offset);
 		}
 		else {
 			$end_of_sql = FALSE;
 			$sql = "";
 
 			while ( !feof($fp) && !$end_of_sql ) {
 				$line = fgets($fp);
 
 				if ( substr($line, 0, 11) == "INSERT INTO" ) {
 					$end_of_sql = TRUE;
 				}
 				else {
 					$sql .= $line;
 					$file_offset = ftell($fp) - strlen($line);
 				}
 			}
 
 			if ( strlen($sql) ) {
 				$error = $this->runSchemaText($sql);
 
 				if ( $error != '' ) {
 					$this->Application->StoreVar('adm.restore_error', $error);
 
 					return self::SQL_ERROR_DURING_RESTORE;
 				}
 			}
 
 			fseek($fp, $file_offset);
 		}
 
 		$lines_read = 0;
 		$all_sqls = Array ();
 
 		while ( $lines_read < self::RESTORE_PER_STEP && !feof($fp) ) {
 			$sql = fgets($fp);
 
 			if ( strlen($sql) ) {
 				$all_sqls[] = $sql;
 				$lines_read++;
 			}
 		}
 
 		$file_offset = !feof($fp) ? ftell($fp) : $size;
 
 		fclose($fp);
 
 		if ( count($all_sqls) > 0 ) {
 			$error = $this->runSQLText($all_sqls);
 
 			if ( $error != '' ) {
 				$this->Application->StoreVar('adm.restore_error', $error);
 
 				return self::SQL_ERROR_DURING_RESTORE;
 			}
 		}
 
 		$restore_progress['file_pos'] = $file_offset;
 		$this->Application->StoreVar('adm.restore_status', serialize($restore_progress));
 
 		return round($file_offset / $size * 100);
 	}
 
 	/**
 	 * Adds table prefix to given sql set
 	 *
 	 * @param string $sql
 	 * @return void
 	 * @access protected
 	 */
 	protected function addTablePrefix(&$sql)
 	{
 		$table_prefix = 'restore' . TABLE_PREFIX;
 
 		if ( strlen($table_prefix) > 0 ) {
 			$replacements = Array ('INSERT INTO ', 'UPDATE ', 'ALTER TABLE ', 'DELETE FROM ', 'REPLACE INTO ');
 
 			foreach ($replacements as $replacement) {
 				$sql = str_replace($replacement, $replacement . $table_prefix, $sql);
 			}
 		}
 
 		$sql = str_replace('CREATE TABLE ', 'CREATE TABLE IF NOT EXISTS ' . $table_prefix, $sql);
 		$sql = str_replace('DROP TABLE ', 'DROP TABLE IF EXISTS ' . $table_prefix, $sql);
 	}
 
 	/**
 	 * Run given schema sqls and return error, if any
 	 *
 	 * @param $sql
 	 * @return string
 	 * @access protected
 	 */
 	protected function runSchemaText($sql)
 	{
 		$this->addTablePrefix($sql);
 
 		$commands = explode("# --------------------------------------------------------", $sql);
 
 		if ( count($commands) > 0 ) {
 			$commands = array_map('trim', $commands);
 
 			foreach ($commands as $cmd) {
 				if ( strlen($cmd) > 0 ) {
 					$this->Conn->Query($cmd);
 
 					if ( $this->Conn->hasError() ) {
 						return $this->Conn->getErrorMsg() . " COMMAND:<PRE>$cmd</PRE>";
 					}
 				}
 			}
 		}
 
 		return '';
 	}
 
 	/**
 	 * Runs given sqls and return error message, if any
 	 *
 	 * @param $all_sqls
 	 * @return string
 	 * @access protected
 	 */
 	protected function runSQLText($all_sqls)
 	{
 		$line = 0;
 
 		while ( $line < count($all_sqls) ) {
 			$sql = $all_sqls[$line];
 
 			if ( strlen(trim($sql)) > 0 && substr($sql, 0, 1) != "#" ) {
 				$this->addTablePrefix($sql);
 				$sql = trim($sql);
 
 				if ( strlen($sql) > 0 ) {
 					$this->Conn->Query($sql);
 
 					if ( $this->Conn->hasError() ) {
 						return $this->Conn->getErrorMsg() . " COMMAND:<PRE>$sql</PRE>";
 					}
 				}
 			}
 
 			$line++;
 		}
 
 		return '';
 	}
 
 	/**
 	 * Replaces current tables with restored tables
 	 *
 	 * @return void
 	 * @access public
 	 */
 	public function replaceRestoredFiles()
 	{
 		// gather restored table names
 		$tables = $this->Conn->GetCol('SHOW TABLES');
 		$mask_restore_table = '/^restore' . TABLE_PREFIX . '(.*)$/';
 
 		foreach ($tables as $table) {
 			if ( preg_match($mask_restore_table, $table) ) {
 				$old_table = substr($table, 7);
 
 				$this->Conn->Query('DROP TABLE IF EXISTS ' . $old_table);
 				$this->Conn->Query('CREATE TABLE ' . $old_table . ' LIKE ' . $table);
 				$this->Conn->Query('INSERT INTO ' . $old_table . ' SELECT * FROM ' . $table);
 				$this->Conn->Query('DROP TABLE ' . $table);
 			}
 		}
 	}
 
 	/**
 	 * Deletes current backup file
 	 *
 	 * @return void
 	 * @access public
 	 */
 	public function delete()
 	{
 		@unlink($this->getBackupFile());
 	}
 
 	/**
 	 * Returns path to current backup file
 	 *
 	 * @param int|null $backup_date
 	 * @return string
 	 * @access protected
 	 */
 	protected function getBackupFile($backup_date = null)
 	{
 		if ( !isset($backup_date) ) {
 			$backup_date = $this->Application->GetVar('backupdate');
 		}
 
 		return $this->path . '/dump' . $backup_date . '.txt';
 	}
 
 	/**
 	 * Returns list of backup files, available for restore
 	 *
 	 * @return Array
 	 * @access public
 	 */
 	public function getBackupFiles()
 	{
+		/** @var FileHelper $file_helper */
 		$file_helper = $this->Application->recallObject('FileHelper');
-		/* @var $file_helper FileHelper */
 
 		$ret = Array ();
 		$backup_path = $this->Application->ConfigValue('Backup_Path');
 		$file_helper->CheckFolder($backup_path);
 		$backup_files = glob($backup_path . DIRECTORY_SEPARATOR . 'dump*.txt');
 
 		if ( !$backup_files ) {
 			return Array ();
 		}
 
 		foreach ($backup_files as $backup_file) {
 			$ret[] = Array (
 				'filedate' => preg_replace('/^dump([\d]+)\.txt$/', '\\1', basename($backup_file)),
 				'filesize' => filesize($backup_file));
 		}
 
 		rsort($ret);
 
 		return $ret;
 	}
 }
\ No newline at end of file
Index: branches/5.3.x/core/units/helpers/recursive_helper.php
===================================================================
--- branches/5.3.x/core/units/helpers/recursive_helper.php	(revision 16518)
+++ branches/5.3.x/core/units/helpers/recursive_helper.php	(revision 16519)
@@ -1,227 +1,228 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class kRecursiveHelper extends kHelper {
 
 		function DeleteCategory($category_id, $prefix='c')
 		{
 			$config = $this->Application->getUnitConfig($prefix);
 			$id_field = $config->getIDField();
 
 			$sql = 'SELECT '.$id_field.'
 					FROM '. $config->getTableName() .'
 					WHERE ParentId = '.$category_id;
 
 			$sub_categories = $this->Conn->GetCol($sql);
 			if ($sub_categories) {
 				foreach ($sub_categories as $sub_category_id) {
 					$this->DeleteCategory($sub_category_id);
 				}
 			}
 
 			$ci_table = $this->Application->getUnitConfig('ci')->getTableName();
 
 			// 1. remove category items from this category if it is supplemental (non-primary) category to them
 			$sql = 'DELETE FROM '.$ci_table.'
 					WHERE ('.$id_field.' = '.$category_id.') AND (PrimaryCat = 0)';
 			$this->Conn->Query($sql);
 
+			/** @var kTempTablesHandler $temp_handler */
 			$temp_handler = $this->Application->recallObject($prefix.'_TempHandler', 'kTempTablesHandler');
-			/* @var $temp_handler kTempTablesHandler */
 
 			// 2. delete items this have this category as primary
 			$delete_ids = $this->getCategoryItems($category_id, true);
 
 			foreach ($delete_ids as $item_prefix => $resource_ids) {
 				if (!$item_prefix) {
 					// not ItemPrefix filled -> old categoryitem linking
 					continue;
 				}
 				$item_ids = $this->GetItemIDs($item_prefix, $resource_ids);
 				$temp_handler->BuildTables($item_prefix, $item_ids);
 				$temp_handler->DeleteItems($item_prefix, '', $item_ids);
 			}
 
 			// 3. delete this category
 			$temp_handler->BuildTables($prefix, Array($category_id));
 			$temp_handler->DeleteItems($prefix, '', Array($category_id));
 		}
 
 		/**
 		 * Converts resource ids list to id field list for given prefix
 		 *
 		 * @param string $prefix
 		 * @param Array $resource_ids
 		 * @return Array
 		 */
 		function GetItemIDs($prefix, $resource_ids)
 		{
 			if (!$resource_ids) {
 				return Array();
 			}
 
 			$config = $this->Application->getUnitConfig($prefix);
 
 			$sql = 'SELECT '. $config->getIDField() .'
 					FROM '. $config->getTableName() .'
 					WHERE ResourceId IN ('.implode(',', $resource_ids).')';
 			return $this->Conn->GetCol($sql);
 		}
 
 		// moves selected categories to destination category
 		function MoveCategories($category_ids, $dst_category_id)
 		{
 			if (!$category_ids) return ;
 
 			$categories_config = $this->Application->getUnitConfig('c');
 			$id_field = $categories_config->getIDField();
 			$table_name = $categories_config->getTableName();
 
 			// do not move categories into their children
 			$sql = 'SELECT ParentPath
 					FROM '.$table_name.'
 					WHERE '.$id_field.' = '.$dst_category_id;
 			$dst_parent_path = explode('|', substr($this->Conn->GetOne($sql), 1, -1));
 
 			$child_categories = array_intersect($dst_parent_path, $category_ids); // get categories, then can't be moved
 			$category_ids = array_diff($category_ids, $child_categories); // remove them from movable categories list
 
 			if ($category_ids) {
 				$sql = 'UPDATE '.$table_name.'
 						SET ParentId = '.$dst_category_id.'
 						WHERE '.$id_field.' IN ('.implode(',', $category_ids).')';
 				$this->Conn->Query($sql);
 			}
 		}
 
 		/**
 		 * Complete cloning or category with subcategories and sub-items
 		 *
 		 * @param int $category_id
 		 * @param string $prefix
 		 */
 		function PasteCategory($category_id, $prefix = 'c')
 		{
 			$backup_category_id = $this->Application->GetVar('m_cat_id');
 
 			$src_parent_path = $this->_getParentPath($category_id);
 			$dst_parent_path = $this->_getParentPath($backup_category_id);
 
 			if ( substr($dst_parent_path, 0, strlen($src_parent_path)) == $src_parent_path ) {
 				// target path contains source path -> recursion
 				return;
 			}
 
 			// 1. clone category
+			/** @var kTempTablesHandler $temp_handler */
 			$temp_handler = $this->Application->recallObject($prefix . '_TempHandler', 'kTempTablesHandler');
-			/* @var $temp_handler kTempTablesHandler*/
+
 			$temp_handler->BuildTables($prefix, Array ($category_id));
 			$new_category_id = array_pop($temp_handler->CloneItems($prefix, '', Array ($category_id)));
 			$this->Application->SetVar('m_cat_id', $new_category_id);
 
 			// 2. assign supplemental items to current category to new category
 			$paste_ids = $this->getCategoryItems($category_id, false);
 
 			foreach ($paste_ids as $item_prefix => $resource_ids) {
 				if ( !$item_prefix ) {
 					// not ItemPrefix filled -> old categoryitem linking
 					continue;
 				}
 
+				/** @var kCatDBItem $item_object */
 				$item_object = $this->Application->recallObject($item_prefix . '.-item', null, Array ('skip_autoload' => true));
-				/* @var $item_object kCatDBItem */
 
 				foreach ($resource_ids as $item_resource_id) {
 					$item_object->Load($item_resource_id, 'ResourceId');
 					$item_object->assignToCategory($new_category_id, false);
 				}
 			}
 
 			// 3. clone items that have current category as primary
 			$paste_ids = $this->getCategoryItems($category_id, true);
 
 			foreach ($paste_ids as $item_prefix => $resource_ids) {
 				if ( !$item_prefix ) {
 					// not ItemPrefix filled -> old categoryitem linking
 					continue;
 				}
 
 				// 2. clone items from current category (for each prefix separately)
 				$item_ids = $this->GetItemIDs($item_prefix, $resource_ids);
 				$temp_handler->BuildTables($item_prefix, $item_ids);
 				$temp_handler->CloneItems($item_prefix, '', $item_ids);
 			}
 
 			$config = $this->Application->getUnitConfig($prefix);
 
 			// 4. do same stuff for each subcategory
 			$sql = 'SELECT ' . $config->getIDField() . '
 					FROM ' . $config->getTableName() . '
 					WHERE ParentId = ' . $category_id;
 
 			$sub_categories = $this->Conn->GetCol($sql);
 			if ( $sub_categories ) {
 				foreach ($sub_categories as $sub_category_id) {
 					$this->PasteCategory($sub_category_id, $prefix);
 				}
 			}
 
 			$this->Application->SetVar('m_cat_id', $backup_category_id);
 		}
 
 		/**
 		 * Returns grouped category items
 		 *
 		 * @param int $category_id
 		 * @param bool $item_primary_category
 		 * @return Array
 		 */
 		function getCategoryItems($category_id, $item_primary_category = true)
 		{
 			$ci_table = $this->Application->getUnitConfig('ci')->getTableName();
 
 			$sql = 'SELECT ItemPrefix, ItemResourceId
 					FROM '.$ci_table.'
 					WHERE (CategoryId = '.$category_id.') AND (PrimaryCat = '.($item_primary_category ? 1 : 0).')';
 			$category_items = $this->Conn->GetCol($sql, 'ItemResourceId');
 
 			$item_ids = Array();
 			foreach ($category_items as $resource_id => $item_prefix) {
 				$item_ids[$item_prefix][] = $resource_id;
 			}
 			return $item_ids;
 		}
 
 		/**
 		 * Returns parent path for given category
 		 *
 		 * @param int $category_id
 		 * @return Array
 		 */
 		function _getParentPath($category_id)
 		{
 			static $cache = Array ();
 
 			if (!array_key_exists($category_id, $cache)) {
 				$sql = 'SELECT ParentPath
 						FROM ' . TABLE_PREFIX . 'Categories
 						WHERE CategoryId = ' . $category_id;
 				$cache[$category_id] = $this->Conn->GetOne($sql);
 			}
 
 			return $cache[$category_id];
 		}
 	}
\ No newline at end of file
Index: branches/5.3.x/core/units/helpers/modules_helper.php
===================================================================
--- branches/5.3.x/core/units/helpers/modules_helper.php	(revision 16518)
+++ branches/5.3.x/core/units/helpers/modules_helper.php	(revision 16519)
@@ -1,497 +1,497 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class kModulesHelper extends kHelper {
 
 		/**
 		 * Identifies new module, that isn't installed yet
 		 */
 		const NOT_INSTALLED = 1;
 
 		/**
 		 * Identifies installed module
 		 */
 		const INSTALLED = 2;
 
 		/**
 		 * Identifies both installed & new modules
 		 */
 		const ANY = 3;
 
 		function getWhereClause()
 		{
 			$where_clause = Array('Loaded = 1');
 
 			if (!$this->Application->isAdmin) {
 				// no license checks on front-end
 				return implode(' AND ', $where_clause);
 			}
 
 			$modules = $this->_GetModules();
 			if ($modules) {
 				foreach ($modules as $module_index => $module) {
 					$modules[$module_index] = $this->Conn->qstr($module);
 				}
 				$where_clause[] = 'Name IN ('.implode(',', $modules).')';
 			}
 
 			return implode(' AND ', $where_clause);
 		}
 
 		function _EnableCookieSID()
 		{
+			/** @var Session $session */
 			$session = $this->Application->recallObject('Session');
-			/* @var $session Session */
 
 			return $session->CookiesEnabled;
 		}
 
 		function _IsSpider($UserAgent)
 		{
 			global $robots;
 			$lines = file(FULL_PATH.'/robots_list.txt');
 
 			if (!is_array($robots)) {
 				$robots = Array();
 				for($i = 0; $i < count($lines); $i++) {
 					$l = $lines[$i];
 					$p = explode("\t", $l, 3);
 					$robots[] = $p[2];
 		    	}
 		  	}
 			return in_array($UserAgent, $robots);
 		}
 
 		function _MatchIp($ip1, $ip2)
 		{
 			$matched = TRUE;
 
 			$ip = explode('.', $ip1);
 			$MatchIp = explode('.', $ip2);
 			for ($i = 0; $i < count($ip); $i++) {
 				if($i == count($MatchIp)) break;
 				if (trim($ip[$i]) != trim($MatchIp[$i]) || trim($ip[$i]) == '*') {
 					$matched = FALSE;
 					break;
 				}
 			}
 			return $matched;
 		}
 
 		function _IpAccess($IpAddress, $AllowList, $DenyList)
 		{
 			$allowed = explode(',', $AllowList);
 			$denied = explode(',', $DenyList);
 
 			$MatchAllowed = FALSE;
 			for ($x = 0; $x < count($allowed); $x++) {
 				$ip = explode('.', $allowed[$x]);
 
 				$MatchAllowed = $this->_MatchIp($IpAddress, $allowed[$x]);
 				if ($MatchAllowed)
 				break;
 			}
 			$MatchDenied = FALSE;
 			for ($x = 0; $x < count($denied); $x++) {
 				$ip = explode('.', $denied[$x]);
 
 				$MatchDenied = $this->_MatchIp($IpAddress, $denied[$x]);
 				if ($MatchDenied)
 				break;
 			}
 
 			$Result = (($MatchAllowed && !$MatchDenied) || (!$MatchAllowed && !$MatchDenied) ||
 		  			  ($MatchAllowed && $MatchDenied));
 			return $Result;
 		}
 
 		/**
 		 * Leaves only domain part from hostname (e.g. extract "intechnic.lv" from "test.intechnic.lv")
 		 * Used for admin login license check
 		 *
 		 * @param string $d
 		 * @return string
 		 */
 		function _StripDomainHost($d)
 		{
 			$IsIp = false;
 			$dotcount = substr_count($d, '.');
 			if ($dotcount == 3) {
 				$IsIp = true;
 				for ($x = 0; $x < strlen($d); $x++) {
 					if (!is_numeric(substr($d, $x, 1)) && substr($d, $x, 1) != '.')
 					{
 						$IsIp = false;
 						break;
 					}
 				}
 			}
 
 			if ($dotcount > 1 && !$IsIp) {
 				$p = explode('.', $d);
 				$ret = $p[count($p) - 2].'.'.$p[count($p) - 1];
 			}
 			else {
 				$ret = $d;
 			}
 			return $ret;
 		}
 
 		/**
 		 * When logging into admin then check only last 2 parts of host name VS domain in license
 		 *
 		 * @param string $user_domain
 		 * @param string $license_domain
 		 * @return int
 		 */
 		function _CheckDomain($user_domain, $license_domain)
 		{
 			if ($this->Application->isAdmin) {
 				$user_domain = $this->_StripDomainHost($user_domain);
 				return preg_match('/(.*)'.preg_quote($user_domain, '/').'$/', $license_domain);
 			}
 			else {
 				return preg_match('/(.*)'.preg_quote($license_domain, '/').'$/', $user_domain);
 			}
 		}
 
 		/**
 		 * Returns modules list, that are in license
 		 *
 		 * @return Array
 		 */
 		function _GetModules()
 		{
 		    static $modules = null;
 
 		    if (isset($modules)) {
 		    	return $modules;
 		    }
 
 		    $modules = Array();
 			$system_config = kUtil::getSystemConfig();
 		    $license = $system_config->get('License') ? base64_decode($system_config->get('License')) : false;
 
 		    if ($license) {
 			    list ( , , $i_Keys) = $this->_ParseLicense($license);
 			    $domain = $this->_GetDomain($system_config);
 			    if (!$this->_IsLocalSite($domain)) {
 			        for ($x = 0; $x < count($i_Keys); $x++) {
 			            $key = $i_Keys[$x];
 			            if ($this->_CheckDomain($domain, $key['domain'])) {
 			            	// used hostname is subdomain or matches domain from license
 			            	$modules = explode(',', $key['mod']);
 			            }
 			        }
 			    }
 			    else {
 			    	// all already installed modules are licensed for localhost
 			        $modules = array_keys($this->Application->ModuleInfo);
 			    }
 		    }
 
 		    // all modules starting from "in-" doesn't require license
 		    $base_modules = Array ('Core', 'In-Portal', 'Custom');
 		    $modules = array_merge($modules, $base_modules, $this->_getFreeModules($system_config));
 		    $modules = array_unique( array_map('strtolower', $modules) );
 
 		    return $modules;
 		}
 
 		/**
 		 * Get all modules, that don't require licensing
 		 *
 		 * @param kSystemConfig $system_config
 		 * @return Array
 		 * @access protected
 		 */
 		protected function _getFreeModules(kSystemConfig $system_config)
 		{
 			return array_map('strtolower', $this->getModules());
 		}
 
 		/**
 		 * Allows to determine if module is licensed
 		 *
 		 * @param string $name
 		 * @return bool
 		 */
 		function _ModuleLicensed($name)
 		{
 		    $modules = $this->_GetModules();
 			return in_array($name, $modules);
 		}
 
 		/**
 		 * Returns domain from licences (and direct in case of install script)
 		 *
 		 * @param kSystemConfig $system_config
 		 * @return string
 		 */
 		function _GetDomain(kSystemConfig $system_config)
 		{
 			return $system_config->get('Domain', SERVER_NAME);
 		}
 
 		function _keyED($txt, $encrypt_key)
 		{
 			$encrypt_key = md5($encrypt_key);
 			$ctr = 0;
 			$tmp = '';
 			for ($i = 0; $i < strlen($txt); $i++) {
 				if ($ctr == strlen($encrypt_key)) $ctr = 0;
 				$tmp .= substr($txt, $i, 1) ^ substr($encrypt_key, $ctr, 1);
 				$ctr++;
 			}
 			return $tmp;
 		}
 
 
 		function _decrypt($txt, $key)
 		{
 			$txt = $this->_keyED($txt,$key);
 			$tmp = '';
 			for ($i = 0; $i < strlen($txt); $i++) {
 				$md5 = substr($txt, $i, 1);
 				$i++;
 				$tmp .= (substr($txt, $i, 1) ^ $md5);
 			}
 			return $tmp;
 		}
 
 		function LoadFromRemote()
 		{
 		    return '';
 		}
 
 		function DLid()
 		{
 		    die($GLOBALS['lid']."\n");
 		}
 
 		function _LoadLicense($LoadRemote = false)
 		{
 		    $f = FULL_PATH.'/intechnic.php';
 		    if ($this->_falseIsLocalSite($f)) $ret = true;
 		    if (file_exists($f)) {
 		        $contents = file($f);
 		        $data = base64_decode($contents[1]);
 		    }
 		    else {
 		        if ($LoadRemote) return $LoadFromRemote;
 		    }
 		   return $data;
 		}
 
 		function _VerifyKey($domain, $k)
 		{
 		    $key = md5($domain);
 		    $lkey = substr($key, 0, strlen($key) / 2);
 		    $rkey = substr($key, strlen($key) / 2);
 		    $r = $rkey.$lkey;
 		    if ($k == $r) return true;
 		    return false;
 		}
 
 		function _ParseLicense($txt)
 		{
 //			global $i_User, $i_Pswd, $i_Keys;
 
 			if (!$this->_falseIsLocalSite($txt)) {
 				$nah = false;
 			}
 
 			$data = $this->_decrypt($txt, 'beagle');
 			$i_User = $i_Pswd = '';
 			$i_Keys = Array();
 			$lines = explode("\n", $data);
 			for ($x = 0; $x < count($lines); $x++) {
 				$l = $lines[$x];
 				$p = explode('=', $l, 2);
 				switch($p[0]) {
 					case 'Username':
 						$i_User = $p[1];
 						break;
 
 					case 'UserPass':
 						$i_Pswd = $p[1];
 						break;
 
 					default:
 						if (substr($p[0], 0, 3) == 'key') {
 							$parts = explode('|', $p[1]);
 							if ($this->_VerifyKey($parts[0], $parts[1])) {
 								unset($K);
 								$k['domain'] = $parts[0];
 								$k['key'] = $parts[1];
 								$k['desc'] = $parts[2];
 								$k['mod'] = $parts[3];
 								$i_Keys[] = $k;
 							}
 						}
 						break;
 				}
 			}
 
 			return Array ($i_User, $i_Pswd, $i_Keys);
 		}
 
 		function _GetObscureValue($i)
 		{
 			if ($i == 'x') return 0254; $z = '';
 			if ($i == 'z') return 0x7F.'.';
 			if ($i == 'c') return '--code--';
 			if ($i >= 5 && $i < 7) return $this->_GetObscureValue($z)*$this->_GetObscureValue('e');
 			if ($i > 30) return Array(0x6c,0x6f,0x63,0x61,0x6c,0x68,0x6f,0x73,0x74);
 			if ($i > 20) return 99;
 			if ($i > 10) return '.'.($this->_GetObscureValue(6.5)+1);
 			if ($i == 'a') return 0xa;
 
 			return 0;
 		}
 
 		function _Chr($val)
 		{
 			$x = $this->_GetObscureValue(25);
 			$f = chr($x).chr($x+5).chr($x+15);
 			return $f($val);
 		}
 
 		function _IsLocalSite($domain)
 		{
 		    $ee = $this->_GetObscureValue(35); $yy = '';
 			foreach ($ee as $e) $yy .= $this->_Chr($e);
 		    $localb = FALSE;
 		    if(substr($domain,0,3)==$this->_GetObscureValue('x'))
 		    {
 		        $b = substr($domain,0,6);
 		        $p = explode(".",$domain);
 		        $subnet = $p[1];
 		        if($p[1]>15 && $p[1]<32)
 		            $localb=TRUE;
 		    }
 		    $zz = $this->_GetObscureValue('z').$this->_GetObscureValue(5).'.'.(int)$this->_GetObscureValue(7).$this->_GetObscureValue(12);
 		    $ff = $this->_GetObscureValue('z')+65;
 		    $hh = $ff-0x18;
 		    if($domain==$yy || $domain==$zz || substr($domain,0,7)==$ff.$this->_Chr(46).$hh ||
 		       substr($domain,0,3)==$this->_GetObscureValue('a').$this->_Chr(46) || $localb || strpos($domain,".")==0)
 		    {
 		        return TRUE;
 		    }
 		    return FALSE;
 		}
 
 		function _falseIsLocalSite($domain)
 		{
 		    $localb = FALSE;
 		    if(substr($domain,0,3)=="172")
 		    {
 		        $b = substr($domain,0,6);
 		        $p = explode(".",$domain);
 		        $subnet = $p[1];
 		        if($p[1]>15 && $p[1]<32)
 		            $localb=TRUE;
 		    }
 		    if($domain=="localhost" || $domain=="127.0.0.1" || substr($domain,0,7)=="192.168" ||
 		       substr($domain,0,3)=="10." || $localb || strpos($domain,".")==0)
 		    {
 		        return TRUE;
 		    }
 		    return FALSE;
 		}
 
 		function verifyLicense($license_hash)
 		{
 			$license_hash = base64_decode($license_hash);
 			list ($license_user, $license_password, ) = $this->_ParseLicense($license_hash);
 			return strlen($license_user) && strlen($license_password);
 		}
 
 		function moduleInstalled($module_name)
 		{
 			static $modules = null;
 
 			if ( is_null($modules) ) {
 				$sql = 'SELECT LOWER(Name)
 						FROM ' . $this->Application->getUnitConfig('mod')->getTableName();
 				$modules = $this->Conn->GetCol($sql);
 			}
 
 			if ( $module_name == 'kernel' ) {
 				$module_name = 'in-portal';
 			}
 
 			return in_array(strtolower($module_name), $modules);
 		}
 
 		/**
 		 * Returns list of matching modules
 		 *
 		 * @param int $module_type
 		 * @return Array
 		 * @access public
 		 */
 		public function getModules($module_type = self::ANY)
 		{
 			$modules = Array ();
 
 			try {
 				$iterator = new DirectoryIterator(MODULES_PATH);
-				/* @var $file_info DirectoryIterator */
+				/** @var DirectoryIterator $file_info */
 			}
 			catch (UnexpectedValueException $e) {
 				return $modules;
 			}
 
 			foreach ($iterator as $file_info) {
 				$file_path = $file_info->getPathname();
 
 				if ( $file_info->isDir() && !$file_info->isDot() && $this->isInPortalModule($file_path) ) {
 					$install_order = trim( file_get_contents($file_path . '/install/install_order.txt') );
 					$modules[$install_order] = $file_info->getFilename();
 				}
 			}
 
 			// allows to control module install order
 			ksort($modules, SORT_NUMERIC);
 
 			if ( $module_type == self::ANY ) {
 				return $modules;
 			}
 
 			foreach ($modules as $install_order => $module_name) {
 				$installed = $this->moduleInstalled($module_name);
 
 				if ( ($module_type == self::INSTALLED && !$installed) || ($module_type == self::NOT_INSTALLED && $installed) ) {
 					unset($modules[$install_order]);
 				}
 			}
 
 			return $modules;
 		}
 
 		/**
 		 * Checks, that given folder is In-Portal module's root folder
 		 *
 		 * @param string $folder_path
 		 * @return bool
 		 * @access public
 		 */
 		public static function isInPortalModule($folder_path)
 		{
 			return file_exists($folder_path . '/install.php') && file_exists($folder_path . '/install/install_schema.sql');
 		}
 	}
Index: branches/5.3.x/core/units/helpers/permissions_helper.php
===================================================================
--- branches/5.3.x/core/units/helpers/permissions_helper.php	(revision 16518)
+++ branches/5.3.x/core/units/helpers/permissions_helper.php	(revision 16519)
@@ -1,847 +1,848 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class kPermissionsHelper extends kHelper {
 
 		/**
 		 * Current set of permissions for group being edited
 		 *
 		 * @var Array
 		 */
 		var $Permissions = Array();
 
 		function LoadPermissions($group_id, $cat_id, $type = 1, $prefix = '')
 		{
 			$perm_table = $this->Application->getUnitConfig('perm')->getTableName();
 			$perm_table = $this->Application->GetTempName($perm_table, 'prefix:'.$prefix);
 			$sql = 'SELECT *
 					FROM '.$perm_table.'
 					WHERE (GroupId = '.$group_id.') AND (CatId = '.$cat_id.') AND (Type = '.$type.')';
 			$permissions = $this->Conn->Query($sql, 'Permission');
 
 			$this->Permissions = Array();
 			foreach ($permissions as $perm_name => $perm_options) {
 				$perm_record['value'] = $perm_options['PermissionValue'];
 				$perm_record['id'] = $perm_options['PermissionId'];
 				$this->Permissions[$perm_name] = $perm_record;
 			}
 		}
 
 		function getPermissionValue($perm_name)
 		{
 			 return isset($this->Permissions[$perm_name]) ? $this->Permissions[$perm_name]['value'] : 0;
 		}
 
 		function getPermissionID($perm_name)
 		{
 			return isset($this->Permissions[$perm_name]) ? $this->Permissions[$perm_name]['id'] : 0;
 		}
 
 		/**
 		 * This is old permission like ADMIN or LOGIN
 		 *
 		 * @param string $section_name
 		 * @param string $perm_name
 		 * @return bool
 		 */
 		function isOldPermission($section_name, $perm_name)
 		{
 			return $section_name == 'in-portal:root' && $perm_name != 'view';
 		}
 
 		/**
 		 * Returns permission names to check based on event name and item prefix (main item or subitem)
 		 *
 		 * @param kEvent $event
 		 * @param Array $perm_mapping
 		 * @return Array
 		 */
 		function getPermissionByEvent($event, $perm_mapping)
 		{
 			$top_prefix = $event->getEventParam('top_prefix');
 
 			$prefix_type = ($top_prefix == $event->Prefix) ? 'self' : 'subitem';
 			$perm_mapping = getArrayValue($perm_mapping, $event->Name);
 
 			if (!$perm_mapping[$prefix_type]) {
 				throw new Exception('Permission mappings not defined for event <strong>' . $top_prefix . ' <- ' . $event->Prefix . ':' . $event->Name . '</strong>');
 			}
 
 			if ($perm_mapping[$prefix_type] === true) {
 				// event is defined in mapping but is not checked by permissions
 				return true;
 			}
 
 			return explode('|', $perm_mapping[$prefix_type]);
 		}
 
 		/**
 		 * Common event permission checking method
 		 *
 		 * @param kEvent $event
 		 * @param Array $perm_mapping
 		 * @return bool
 		 */
 		function CheckEventPermission($event, $perm_mapping)
 		{
 			$section = $event->getSection();
 			if (preg_match('/^CATEGORY:(.*)/', $section)) {
 				return $this->CheckEventCategoryPermission($event, $perm_mapping);
 			}
 
 			$top_prefix = $event->getEventParam('top_prefix');
 			$check_perms = $this->getPermissionByEvent($event, $perm_mapping);
 
 			if ($check_perms === true) {
 				// event is defined in mapping but is not checked by permissions
 				return true;
 			}
 
 			$perm_status = false;
 			foreach ($check_perms as $perm_name) {
 				// check if at least one of required permissions is set
 				if ($perm_name == 'debug' && $this->Application->isDebugMode(false)) {
 					// universal "debug" permission
 					return true;
 				}
 				elseif ( $perm_name == 'admin' && $this->Application->isAdminUser ) {
 					// any logged-in admin user will suffice
 					return true;
 				}
 
 				$perm_name = $section.'.'.$perm_name;
 				$perm_status = $this->CheckPermission($perm_name, 1);
 				if (($perm_name == $section.'.add') && $perm_status && ($top_prefix == $event->Prefix)) {
 					// main item, add permission allowed, but ID is > 0, then deny permission
 					// how to get id here
 				}
 
 				if ($perm_status) {
 					return $perm_status;
 				}
 			}
 
 			return $this->finalizePermissionCheck($event, $perm_status);
 		}
 
 		/**
 		 * Returns owner + primary category for each item (used for permission checking)
 		 *
 		 * @param string $prefix
 		 * @param string $ids
 		 * @param bool $temp_mode
 		 * @return Array
 		 * @author Alex
 		 */
 		function GetCategoryItemData($prefix, $ids, $temp_mode = false)
 		{
 			if (is_array($ids)) {
 				$ids = implode(',', $ids);
 			}
 
 			$config = $this->Application->getUnitConfig($prefix);
 			$id_field = $config->getIDField();
 			$table_name = $config->getTableName();
 			$ci_table = $this->Application->getUnitConfig('ci')->getTableName();
 
 			if ($temp_mode) {
 				$table_name = $this->Application->GetTempName($table_name, 'prefix:' . $prefix);
 				$ci_table = $this->Application->GetTempName($ci_table, 'prefix:' . $prefix);
 			}
 
 			$owner_field = $config->getOwnerField('CreatedById');
 
 			$sql = 'SELECT item_table.'.$id_field.', item_table.'.$owner_field.' AS CreatedById, ci.CategoryId
 					FROM '.$table_name.' item_table
 					LEFT JOIN '.$ci_table.' ci ON ci.ItemResourceId = item_table.ResourceId
 					WHERE item_table.'.$id_field.' IN ('.$ids.') AND (ci.PrimaryCat = 1)';
 			return $this->Conn->Query($sql, $id_field);
 		}
 
 		/**
 		 * Check category-based permissions for category items
 		 *
 		 * @param kEvent $event
 		 * @param Array $event_perm_mapping
 		 * @return bool
 		 */
 		function _frontCheckEventCategoryPermission($event, $event_perm_mapping)
 		{
 			// mapping between specific permissions and common permissions
 			static $perm_mapping = Array(
 				'add' => 'ADD', 'add.pending' => 'ADD.PENDING', 'edit' => 'MODIFY',
 				'edit.pending' => 'MODIFY.PENDING', 'delete' => 'DELETE', 'view' => 'VIEW',
 				'debug' => 'DEBUG', 'admin' => 'ADMIN',
 			);
 
 			$top_prefix = $event->getEventParam('top_prefix');
+
+			/** @var kCatDBEventHandler $event_handler */
 			$event_handler = $this->Application->recallObject($event->Prefix . '_EventHandler');
-			/* @var $event_handler kCatDBEventHandler */
 
 			$raise_warnings = $event->getEventParam('raise_warnings');
 			$event->setEventParam('raise_warnings', 0);
 			if ( $event->Prefix != $top_prefix ) {
 				$top_event = new kEvent($top_prefix . ':' . $event->Name);
 				$id = $event_handler->getPassedID($top_event);
 			}
 			else {
 				$id = $event_handler->getPassedID($event);
 			}
 			$event->setEventParam('raise_warnings', $raise_warnings);
 
 			$owner_id = USER_ROOT; // owner is root if not detected
 			if ( !$id ) {
 				// item being created -> check by current (before editing started, saved in OnPreCreate event) category permissions
 				// note: category in session is placed on catalog data import start
 				$category_id = $this->Application->isAdmin ? $this->Application->RecallVar('m_cat_id') : $this->Application->GetVar('m_cat_id');
 			}
 			elseif ( $top_prefix == 'c' || $top_prefix == 'st' ) {
 				$category_id = $id;
 			}
 			else {
 				// item being edited -> check by it's primary category permissions
 				$items_info = $this->GetCategoryItemData($top_prefix, $id);
 
 				if ( $items_info ) {
 					$category_id = $items_info[$id]['CategoryId'];
 					$owner_id = $items_info[$id]['CreatedById'];
 				}
 				else {
 					// item wasn't found in database
 					$category_id = $this->Application->GetVar('m_cat_id');
 				}
 			}
 
 			// specific permission check for pending & owner permissions: begin
 			$uploader_events = Array ('OnUploadFile', 'OnDeleteFile', 'OnViewFile');
 			if ( in_array($event->Name, $uploader_events) ) {
 				// don't recall target object during uploader-related, because OnItemLoad will use incorrect
 				// $user_id in Firefox (during Flash problems session will be used from Internet Exploere)
 				$new_item = false;
 			}
 			else {
 				$new_item = $this->Application->isAdminUser && $event_handler->isNewItemCreate($event) ? true : false;
 				$check_status = $this->checkCombinedPermissions($event, $owner_id, (int)$category_id, $new_item);
 			}
 
 			if ( isset($check_status) ) {
 				return $this->finalizePermissionCheck($event, $check_status);
 			}
 			// specific permission check for pending & owner permissions: end
 
 			$perm_status = false;
 			$check_perms = $this->getPermissionByEvent($event, $event_perm_mapping);
 
 			if ( $check_perms === true ) {
 				// event is defined in mapping but is not checked by permissions
 				return true;
 			}
 
 			$item_prefix = $this->Application->getUnitConfig($top_prefix)->getPermItemPrefix();
 
 			foreach ($check_perms as $perm_name) {
 				// check if at least one of required permissions is set
 				if ( !isset($perm_mapping[$perm_name]) ) {
 					// not mapped permission (e.g. advanced:approve) -> skip
 					continue;
 				}
 
 				if ( $perm_name == 'debug' && $this->Application->isDebugMode(false) ) {
 					// universal "debug" permission
 					return true;
 				}
 				elseif ( $perm_name == 'admin' && $this->Application->isAdminUser ) {
 					// any logged-in admin user will suffice
 					return true;
 				}
 
 				$perm_name = $item_prefix . '.' . $perm_mapping[$perm_name];
 				$perm_status = $this->CheckPermission($perm_name, 0, (int)$category_id);
 
 				if ( $perm_status ) {
 					return $perm_status;
 				}
 			}
 
 			return $this->finalizePermissionCheck($event, $perm_status);
 		}
 
 		/**
 		 * Finalizes permission checking (with additional debug output, when in debug mode)
 		 *
 		 * @param kEvent $event
 		 * @param bool $perm_status
 		 * @return bool
 		 */
 		function finalizePermissionCheck($event, $perm_status)
 		{
 			if (!$perm_status) {
 				if (MOD_REWRITE) {
 //					$event->SetRedirectParam('m_cat_id', 0); // category means nothing on admin login screen
 					$event->SetRedirectParam('next_template', 'external:' . $_SERVER['REQUEST_URI']);
 				}
 				else {
 					$event->SetRedirectParam('next_template', $this->Application->GetVar('t'));
 				}
 
 				if ($this->Application->isDebugMode()) {
 					// for debugging purposes
 					$event->SetRedirectParam('section', $event->getSection());
 					$event->SetRedirectParam('main_prefix', $event->getEventParam('top_prefix'));
 					$event->SetRedirectParam('event_name', $event->Name);
 				}
 
 				$event->status = kEvent::erPERM_FAIL;
 			}
 
 			return $perm_status;
 		}
 
 		/**
 		 * Allows to check combined permissions (*.owner, *.pending) for add/modify/delete operations from admin & front-end
 		 *
 		 * @param kEvent $event
 		 * @param int $owner_id
 		 * @param int $category_id
 		 * @param bool $new_item
 		 * @return mixed
 		 */
 		function checkCombinedPermissions($event, $owner_id, $category_id, $new_item = false)
 		{
 			$ret = null; // true/false when used, null when not used
 			$top_prefix = $event->getEventParam('top_prefix');
 
 			// check admin permission
 			if (substr($event->Name, 0, 9) == 'OnPreSave') {
 				if ($new_item) {
 					$ret = $this->AddCheckPermission($category_id, $top_prefix);
 				}
 				else {
 					// add & modify because $new_item is false, when item is aready created & then saved in temp table (even with 0 id)
 					$ret =	$this->AddCheckPermission($category_id, $top_prefix) ||
 							$this->ModifyCheckPermission($owner_id, $category_id, $top_prefix);
 				}
 			}
 
 			// check front-end permissions
 			switch ($event->Name) {
 				case 'OnCreate':
 					$ret = $this->AddCheckPermission($category_id, $top_prefix);
 					break;
 
 				case 'OnUpdate':
 					$ret = $this->ModifyCheckPermission($owner_id, $category_id, $top_prefix);
 					break;
 
 				case 'OnDelete':
 				case 'OnMassDelete':
 					$ret = $this->DeleteCheckPermission($owner_id, $category_id, $top_prefix);
 					break;
 			}
 
 			if ($ret === 0) {
 				// permission check failed (user has no permission)
 				$event->status = kEvent::erPERM_FAIL;
 			}
 
 			return $ret;
 		}
 
 		/**
 		 * Simplified permission check for category items, when adding/editing them from advanced view.
 		 *
 		 * @param kEvent $event
 		 * @param Array $event_perm_mapping
 		 * @return mixed
 		 */
 		function CheckEventCategoryPermission($event, $event_perm_mapping)
 		{
 			if (!$this->Application->isAdmin) {
 				// check front-end permission by old scheme
 				return $this->_frontCheckEventCategoryPermission($event, $event_perm_mapping);
 			}
 
 			if (substr($event->Name, 0, 9) == 'OnPreSave') {
 				// check separately, because permission mapping is not defined for OnPreSave* events
 				$check_perms = Array ('add', 'edit');
 			}
 			else {
 				$check_perms = $this->getPermissionByEvent($event, $event_perm_mapping);
 			}
 
 			if ($check_perms === true) {
 				// event is defined in mapping but is not checked by permissions
 				return true;
 			}
 
 			// 1. most of events does require admin login only
 			$perm_status = $this->Application->isAdminUser;
 
 			// 2. in case, when event require more, then "view" right, then restrict it to temporary tables only
 			if (!in_array('view', $check_perms)) {
 				$perm_status = $perm_status && $this->Application->IsTempMode($event->Prefix, $event->Special);
 			}
 
 			return $this->finalizePermissionCheck($event, $perm_status);
 		}
 
 		function TagPermissionCheck($params, $is_owner = false)
 		{
 			$perm_prefix = getArrayValue($params, 'perm_prefix');
 			$perm_event = getArrayValue($params, 'perm_event');
 			$permission_groups = getArrayValue($params, 'permissions');
 			$check_admin = isset($params['admin']) && $params['admin'];
 
 			if ($permission_groups && !$perm_event) {
 				// check permissions by permission names in current category
 				$permission_groups = explode('|', $permission_groups);
 				$group_has_permission = false;
 
 				$perm_category = isset($params['cat_id']) ? $params['cat_id'] : $this->Application->GetVar('m_cat_id');
 
 				if ($perm_prefix) {
 					// use primary category of item with id from {perm_prefix}_id as base for permission checking
 					$perm_category = $this->getPrimaryCategory($perm_prefix);
 				}
 
 				$is_system = isset($params['system']) && $params['system'] ? 1 : 0;
 				foreach ($permission_groups as $permission_group) {
 					$has_permission = true;
 					$permissions = explode(',', $permission_group);
 
 					if ( $check_admin ) {
 						foreach ($permissions as $permission) {
 							$owner_checked = (strpos($permission, '.OWNER.') !== false) ? $is_owner : true;
 							$has_permission = $has_permission && $this->CheckAdminPermission($permission, $is_system, $perm_category) && $owner_checked;
 						}
 					}
 					else {
 						foreach ($permissions as $permission) {
 							$owner_checked = (strpos($permission, '.OWNER.') !== false) ? $is_owner : true;
 							$has_permission = $has_permission && $this->CheckPermission($permission, $is_system, $perm_category) && $owner_checked;
 						}
 					}
 
 					$group_has_permission = $group_has_permission || $has_permission;
 
 					if ($group_has_permission) {
 						return true;
 					}
 				}
 				return false;
 			}
 			elseif ($perm_event) {
 				// check permission by event name
 				list ($prefix, ) = explode(':', $perm_event);
 
+				/** @var kEventHandler $event_handler */
 				$event_handler = $this->Application->recallObject($prefix . '_EventHandler');
-				/* @var $event_handler kEventHandler */
 
 				return $event_handler->CheckPermission( new kEvent($perm_event) );
 			}
 
 			return true;
 		}
 
 		/**
 		 * Returns item's primary category (get item_id from request)
 		 *
 		 * @param string $prefix
 		 * @return int
 		 */
 		function getPrimaryCategory($prefix)
 		{
 			$id = $this->Application->GetVar($prefix.'_id');
 
 			if (!$id) {
 				return $this->Application->GetVar('m_cat_id');
 			}
 
 			$config = $this->Application->getUnitConfig($prefix);
 
 			$sql = 'SELECT ResourceId
 					FROM '. $config->getTableName() .'
 					WHERE '. $config->getIDField() .' = '.(int)$id;
 			$resource_id = $this->Conn->GetOne($sql);
 
 			$sql = 'SELECT CategoryId
 					FROM '.$this->Application->getUnitConfig('ci')->getTableName().'
 					WHERE ItemResourceId = '.$resource_id.' AND PrimaryCat = 1';
 			return $this->Conn->GetOne($sql);
 		}
 
 		/**
 		 * Returns no permission template to redirect to
 		 *
 		 * @param Array $params
 		 * @return Array
 		 */
 		function getPermissionTemplate($params)
 		{
 			$t = $this->Application->GetVar('t');
 			$next_t = getArrayValue($params, 'next_template');
 
 			if ( $next_t ) {
 				$t = $next_t;
 			}
 
 			$redirect_params = $this->Application->HttpQuery->getRedirectParams(true);
 
 			if (array_key_exists('pass_category', $params)) {
 				$redirect_params['pass_category'] = $params['pass_cateogry'];
 			}
 
 			if (MOD_REWRITE) {
 				// TODO: $next_t variable is ignored !!! (is anyone using m_RequireLogin tag with "next_template" parameter?)
 				$redirect_params = Array (
 					'm_cat_id' => 0, // category means nothing on admin login screen
 					'next_template' => 'external:' . $_SERVER['REQUEST_URI'],
 				);
 			}
 			else {
 				$redirect_params['next_template'] = $t;
 			}
 
 			if ($this->Application->isAdmin) {
 				$redirect_params['m_wid'] = ''; // remove wid, otherwise parent window may add wid to its name breaking all the frameset (for <a> targets)
 				$redirect_params['pass'] = 'm'; // don't pass any other (except "m") prefixes to admin login template
 			}
 
 			if (!$this->Application->LoggedIn()) {
 				$redirect_template = array_key_exists('login_template', $params) ? $params['login_template'] : '';
 
 				if (!$redirect_template && $this->Application->isAdmin) {
 					$redirect_template = 'login';
 				}
 			}
 			else {
 				if (array_key_exists('no_permissions_template', $params)) {
 					$redirect_template = $params['no_permissions_template'];
 				}
 				else {
 					$redirect_template = $this->Application->isAdmin ? 'no_permission' : $this->Application->ConfigValue('NoPermissionTemplate');
 				}
 
 				if ($this->Application->isDebugMode()) {
 					$redirect_params['from_template'] = 1;
 					$redirect_params['perms'] = $params[ isset($params['permissions']) ? 'permissions' : 'perm_event' ];
 				}
 			}
 
 			if (isset($params['index_file']) && $params['index_file']) {
 				$redirect_params['index_file'] = $params['index_file'];
 			}
 
 			return Array ($redirect_template, $redirect_params);
 		}
 
 		/**
 		 * Check current user permissions based on it's group permissions in specified category (for non-system permissions) or just checks if system permission is set
 		 *
 		 * @param string $name permission name
 		 * @param int $cat_id category id, current used if not specified
 		 * @param int $type permission type {1 - system, 0 - per category}
 		 * @return int
 		 */
 		function CheckPermission($name, $type = 1, $cat_id = null)
 		{
 			$user_id = $this->Application->RecallVar('user_id');
 			return $this->CheckUserPermission($user_id, $name, $type, $cat_id);
 		}
 
 		/**
 		 * Check current admin permissions (when called from Front-End) based on it's group permissions in specified category (for non-system permissions) or just checks if system permission is set
 		 *
 		 * @param string $name permission name
 		 * @param int $cat_id category id, current used if not specified
 		 * @param int $type permission type {1 - system, 0 - per category}
 		 * @return int
 		 */
 		function CheckAdminPermission($name, $type = 1, $cat_id = null)
 		{
 			if ( $this->Application->isAdmin ) {
 				return $this->CheckPermission($name, $type, $cat_id);
 			}
 
 			$user_id = $this->Application->RecallVar('admin_user_id');
 			return $this->CheckUserPermission($user_id, $name, $type, $cat_id);
 		}
 
 		function CheckUserPermission($user_id, $name, $type = 1, $cat_id = null)
 		{
 			$user_id = (int)$user_id;
 
 			if ( $user_id == USER_ROOT ) {
 				// "root" is allowed anywhere
 				return substr($name, -5) == '.deny' || $name == 'SYSTEM_ACCESS.READONLY' ? 0 : 1;
 			}
 
 			if ( !isset($cat_id) ) {
 				$cat_id = $this->Application->GetVar('m_cat_id');
 			}
 
 			if ( $type == 1 ) {
 				// "system" permission are always checked per "Home" category (ID = 0)
 				$cat_id = 0;
 			}
 			elseif ( "$cat_id" === "0" ) {
 				$cat_id = $this->Application->getBaseCategory();
 			}
 
 			// perm cache is build only based on records in db, that's why if permission is not explicitly denied, then
 			// that (perm cache creator) code thinks that it is allowed & adds corresponding record and code below will
 			// return incorrect results
 			if ( $user_id == $this->Application->RecallVar('user_id') ) {
 				$groups = $this->Application->RecallVar('UserGroups');
 			}
 			else {
 				// checking not current user
 				$groups = $this->Application->RecallVar('UserGroups:' . $user_id);
 
 				if ( $groups === false ) {
 //					die('me');
 					$sql = 'SELECT GroupId
 							FROM '.TABLE_PREFIX.'UserGroupRelations
 							WHERE (PortalUserId = '.$user_id.') AND ( (MembershipExpires IS NULL) OR ( MembershipExpires >= UNIX_TIMESTAMP() ) )';
 					$groups = $this->Conn->GetCol($sql);
 
 					array_push($groups, $this->Application->ConfigValue('User_LoggedInGroup') );
 					$groups = implode(',', $groups);
 
 					$this->Application->StoreVar('UserGroups:' . $user_id, $groups);
 				}
 			}
 
 			$groups = explode(',', $groups);
 			$cache_key = $name . '|' . $type . '|' . $cat_id . '|' . implode(',', $groups);
 			$perm_value = $this->Application->getCache('permissions[%' . ($type == 1 ? 'G' : 'C') . 'PermSerial%]:' . $cache_key);
 
 			if ( $perm_value !== false ) {
 				return $perm_value;
 			}
 
 			if ( preg_match('/(.*)\.VIEW$/', $name) && ($type == 0) ) {
 				// cached view permission of category: begin
 				if ( $this->Application->ConfigValue('CheckViewPermissionsInCatalog') ) {
 					if ( strpos($cat_id, '|') !== false ) {
 						$category_path = explode('|', substr($cat_id, 1, -1));
 						$cat_id = end($category_path);
 					}
 
 					$sql = 'SELECT PermissionConfigId
 							FROM ' . TABLE_PREFIX . 'CategoryPermissionsConfig
 							WHERE PermissionName = ' . $this->Conn->qstr($name);
 					$perm_id = $this->Conn->GetOne($sql);
 
 					$sql = 'SELECT PermId
 							FROM ' . TABLE_PREFIX . 'CategoryPermissionsCache
 							WHERE (PermId = ' . $perm_id . ') AND (CategoryId = ' . (int)$cat_id . ')';
 
 					$view_filters = Array ();
 					foreach ($groups as $group) {
 						$view_filters[] = 'FIND_IN_SET(' . $group . ', ACL)';
 					}
 					$sql .= ' AND (' . implode(' OR ', $view_filters) . ')';
 					$perm_value = $this->Conn->GetOne($sql) ? 1 : 0;
 				}
 				else {
 					$perm_value = 1;
 				}
 
 				$this->Application->setCache('permissions[%CPermSerial%]:' . $cache_key, $perm_value);
 				return $perm_value;
 				// cached view permission of category: end
 			}
 
 			if ( is_numeric($cat_id) && $cat_id == 0 ) {
 				$cat_hierarchy = Array (0);
 			}
 			else {
 				if ( strpos($cat_id, '|') !== false ) {
 					$cat_hierarchy = $cat_id;
 				}
 				else {
 					$sql = 'SELECT ParentPath
 							FROM ' . $this->Application->getUnitConfig('c')->getTableName() . '
 							WHERE CategoryId = ' . $cat_id;
 					$cat_hierarchy = $this->Conn->GetOne($sql);
 					if ( $cat_hierarchy === false ) {
 						// category was deleted, but reference to it stays in other tables -> data integrity is broken
 						$cat_hierarchy = '|' . $this->Application->getBaseCategory() . '|';
 					}
 				}
 
 				$cat_hierarchy = explode('|', substr($cat_hierarchy, 1, -1));
 				$cat_hierarchy = array_reverse($cat_hierarchy);
 				array_push($cat_hierarchy, 0);
 			}
 
 			$perm_value = 0;
 			$groups = implode(',', $groups);
 			foreach ($cat_hierarchy as $category_id) {
 				$sql = 'SELECT SUM(PermissionValue)
 						FROM ' . TABLE_PREFIX . 'Permissions
 						WHERE Permission = "' . $name . '" AND CatId = ' . $category_id . ' AND GroupId IN (' . $groups . ') AND Type = ' . $type;
 				$res = $this->Conn->GetOne($sql);
 
 				if ( $res !== false && !is_null($res) ) {
 					$perm_value = $res ? 1 : 0;
 					break;
 				}
 			}
 
 			$this->Application->setCache('permissions[%' . ($type == 1 ? 'G' : 'C') . 'PermSerial%]:' . $cache_key, $perm_value);
 
 			return $perm_value;
 		}
 
 		/**
 		 * Returns categories, where given permission is set to "1"
 		 *
 		 * @param string $permission_name
 		 * @return Array
 		 */
 		function getPermissionCategories($permission_name)
 		{
 			$groups = $this->Application->RecallVar('UserGroups');
 
 			// get categories, where given permission is explicitely defined
 			$sql = 'SELECT SUM(PermissionValue), CatId
 					FROM ' . TABLE_PREFIX . 'Permissions
 					WHERE Permission = "' . $permission_name . '" AND GroupId IN (' . $groups . ') AND Type = 0
 					GROUP BY CatId';
 			$permissions = $this->Conn->GetCol($sql, 'CatId');
 
 			// get all categories along with their parent path
 			$sql = 'SELECT ParentPath, CategoryId
 					FROM ' . TABLE_PREFIX . 'Categories';
 			$parent_paths = $this->Conn->GetCol($sql, 'CategoryId');
 
 			foreach ($parent_paths as $category_id => $parent_path) {
 				if (array_key_exists($category_id, $permissions)) {
 					// permission for given category is set explicitly
 					continue;
 				}
 
 				$perm_value = 0;
 				$parent_path = explode('|', substr($parent_path, 1, -1));
 				$parent_path = array_reverse($parent_path);
 				array_push($parent_path, 0);
 
 				foreach ($parent_path as $parent_category_id) {
 					if (array_key_exists($parent_category_id, $permissions)) {
 						$perm_value = $permissions[$parent_category_id] ? 1 : 0;
 						break;
 					}
 				}
 
 				$permissions[$category_id] = $perm_value;
 			}
 
 			// remove categories, where given permissions is denied
 			foreach ($permissions as $category_id => $perm_value) {
 				if (!$perm_value) {
 					unset($permissions[$category_id]);
 				}
 			}
 
 			return array_keys($permissions);
 		}
 
 		/**
 		 * Allows to check MODIFY & OWNER.MODFY +/- PENDING permission combinations on item
 		 *
 		 * @param int $owner_id user_id, that is owner of the item
 		 * @param int $category_id primary category of item
 		 * @param string $prefix prefix of item
 		 * @return int {0 - no MODIFY permission, 1 - has MODIFY permission, 2 - has MODIFY.PENDING permission}
 		 */
 		function ModifyCheckPermission($owner_id, $category_id, $prefix)
 		{
 			$perm_prefix = $this->Application->getUnitConfig($prefix)->getPermItemPrefix();
 
 			$live_modify = $this->CheckPermission($perm_prefix.'.MODIFY', ptCATEGORY, $category_id);
 			if ($live_modify) {
 				return 1;
 			}
 			else if ($this->CheckPermission($perm_prefix.'.MODIFY.PENDING', ptCATEGORY, $category_id)) {
 				return 2;
 			}
 
 			if ($owner_id == $this->Application->RecallVar('user_id')) {
 				// user is item's OWNER -> check this permissions first
 				$live_modify = $this->CheckPermission($perm_prefix.'.OWNER.MODIFY', ptCATEGORY, $category_id);
 				if ($live_modify) {
 					return 1;
 				}
 				else if ($this->CheckPermission($perm_prefix.'.OWNER.MODIFY.PENDING', ptCATEGORY, $category_id)) {
 					return 2;
 				}
 			}
 
 			return 0;
 		}
 
 		/**
 		 * Allows to check DELETE & OWNER.DELETE permission combinations on item
 		 *
 		 * @param int $owner_id user_id, that is owner of the item
 		 * @param int $category_id primary category of item
 		 * @param string $prefix prefix of item
 		 * @return int {0 - no DELETE permission, 1 - has DELETE/OWNER.DELETE permission}
 		 */
 		function DeleteCheckPermission($owner_id, $category_id, $prefix)
 		{
 			$perm_prefix = $this->Application->getUnitConfig($prefix)->getPermItemPrefix();
 
 			$live_delete = $this->CheckPermission($perm_prefix.'.DELETE', ptCATEGORY, $category_id);
 			if ($live_delete) {
 				return 1;
 			}
 
 			if ($owner_id == $this->Application->RecallVar('user_id')) {
 				// user is item's OWNER -> check this permissions first
 				$live_delete = $this->CheckPermission($perm_prefix.'.OWNER.DELETE', ptCATEGORY, $category_id);
 				if ($live_delete) {
 					return 1;
 				}
 			}
 
 			return 0;
 		}
 
 		/**
 		 * Allows to check ADD +/- PENDING permission combinations on item
 		 *
 		 * @param int $category_id primary category of item
 		 * @param string $prefix prefix of item
 		 * @return int {0 - no ADD permission, 1 - has ADD permission, 2 - has ADD.PENDING permission}
 		 */
 		function AddCheckPermission($category_id, $prefix)
 		{
 			$perm_prefix = $this->Application->getUnitConfig($prefix)->getPermItemPrefix();
 
 			$live_add = $this->CheckPermission($perm_prefix.'.ADD', ptCATEGORY, $category_id);
 			if ($live_add) {
 				return 1;
 			}
 			else if ($this->CheckPermission($perm_prefix.'.ADD.PENDING', ptCATEGORY, $category_id)) {
 				return 2;
 			}
 
 			return 0;
 		}
 	}
\ No newline at end of file
Index: branches/5.3.x/core/units/helpers/template_helper.php
===================================================================
--- branches/5.3.x/core/units/helpers/template_helper.php	(revision 16518)
+++ branches/5.3.x/core/units/helpers/template_helper.php	(revision 16519)
@@ -1,444 +1,444 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class TemplateHelper extends kHelper {
 
 		/**
 		 * parser element location information
 		 *
 		 * @var Array
 		 */
 		var $_blockLocation = Array ();
 
 		/**
 		 * Block name, that will be used
 		 *
 		 * @var string
 		 */
 		var $_blockName = '';
 
 		/**
 		 * Function name, that represents compiled block
 		 *
 		 * @var sting
 		 */
 		var $_functionName = '';
 
 		/**
 		 * Errors found during template parsing
 		 *
 		 * @var Array
 		 */
 		var $_parseErrors = Array ();
 
 		/**
 		 * Source template, that is being edited
 		 *
 		 * @var string
 		 */
 		var $_sourceTemplate = '';
 
 		var $_initMade = false;
 
 		/**
 		 * Performs init ot helper
 		 *
 		 * @param kDBItem $object
 		 */
 		function InitHelper(&$object)
 		{
 			if ($this->_initMade) {
 				return ;
 			}
 
 			// 1. get block information
 			$block_info = $this->Application->GetVar('block');
 			list ($this->_blockName, $this->_functionName) = explode(':', $block_info);
 
 			$this->_parseTemplate($object);
 
 			if (array_key_exists($this->_functionName, $this->Application->Parser->ElementLocations)) {
 				$this->_blockLocation = $this->Application->Parser->ElementLocations[$this->_functionName];
 			}
 
 			$this->_initMade = true;
 		}
 
 		function _getSourceTemplate()
 		{
 			// get source template
 			$t = $this->Application->GetVar('source');
 
 			if (!$this->Application->TemplatesCache->TemplateExists($t)) {
+				/** @var CategoriesEventHandler $cms_handler */
 				$cms_handler = $this->Application->recallObject('st_EventHandler');
-				/* @var $cms_handler CategoriesEventHandler */
 
 				$t = ltrim($cms_handler->GetDesignTemplate($t), '/');
 			}
 
 			$this->_sourceTemplate = $t;
 		}
 
 		function _getThemeName()
 		{
 			$config = $this->Application->getUnitConfig('theme');
 			$theme_id = (int)$this->Application->GetVar('theme_id');
 
 			$sql = 'SELECT Name
 					FROM ' . $config->getTableName() . '
 					WHERE ' . $config->getIDField() . ' = ' . $theme_id;
 
 			return $this->Conn->GetOne($sql);
 		}
 
 		/**
 		 * Render source template to get parse errors OR it's element locations
 		 *
 		 * @param kDBItem $object
 		 * @param string $append
 		 * @return bool
 		 */
 		function _parseTemplate(&$object, $append = '')
 		{
 			try {
 				// 1. parse template
 				$this->Application->InitParser( $this->_getThemeName() ); // we have no parser when saving block content
 
 				$this->_getSourceTemplate();
 
 				// 2. design templates have leading "/" in the beginning
 				$this->Application->Parser->Run($this->_sourceTemplate . $append);
 			}
 			catch (ParserException $e) {
 				$this->_parseErrors[] = Array ('msg' => $e->getMessage(), 'file' => $e->getFile(), 'line' => $e->getLine());
 			}
 
 			if ($this->_parseErrors) {
 				if ($this->_isMainTemplate()) {
 					// 2.1. delete temporary file, that was parsed
 					$filename = $this->_getTemplateFile(false, $append . '.tpl');
 					if (!unlink($filename)) {
 						$error_file = $this->_getTemplateFile(true, $append . '.tpl');
 						$object->SetError('FileContents', 'template_delete_failed', '+Failed to delete temporary template "<strong>' . $error_file . '</strong>"');
 						return false;
 					}
 				}
 				else {
 					// 2.2. restore backup
 					if (!rename($this->_getTemplateFile(false, '.tpl.bak'), $this->_getTemplateFile(false))) {
 						$error_file = $this->_getTemplateFile(true);
 						$object->SetError('FileContents', 'template_restore_failed', '+Failed to restore template "<strong>' . $error_file . '</strong>" from backup.');
 						return false;
 					}
 				}
 
 				return false;
 			}
 
 			return true;
 		}
 
 		/**
 		 * Move elements in template and save changes, when possible
 		 *
 		 * @param Array $target_order
 		 * @return bool
 		 */
 		function moveTemplateElements($target_order)
 		{
 			// 2. parse template
 			$this->Application->InitParser(); // we have no parser when saving block content
 
 			$this->_getSourceTemplate();
 
 			$filename = $this->Application->TemplatesCache->GetRealFilename($this->_sourceTemplate) . '.tpl';
 			if (!is_writable($filename)) {
 				// we can't save changes, don't bother calculating new template contents
 				return false;
 			}
 
 			$data = file_get_contents($filename);
 
 			$line_ending = strpos($data, "\r") !== false ? "\r\n" : "\n";
 
 			// 1. get location of movable areas
 			$mask = '';
 			$start_pos = 0;
 			$elements = $area = Array ();
 			$areas = $this->_getDivPairs($data, 'movable-area');
 
 			foreach ($areas as $area_index => $area) {
 				// 1.1. get locations of all movable elements inside given area
 				$area_content = substr($area['data'], $area['open_len'], -$area['close_len']);
 				$elements = array_merge($elements, $this->_getDivPairs($area_content, 'movable-element', $area_index, $area['open_pos'] + $area['open_len']));
 
 				// 1.2. prepare mask to place movable elements into (don't include movable area div ifself)
 				$mask .= "\t" . substr($data, $start_pos, $area['open_pos'] + $area['open_len'] - $start_pos) . $line_ending . "\t\t" . '#AREA' . $area_index . '#' . $line_ending;
 				$start_pos = $area['close_pos'] - $area['close_len'];
 			}
 			$mask = trim($mask . "\t" . substr($data, $area['close_pos'] - $area['close_len']));
 
 			if (!$elements) {
 				// no elements found
 				return false;
 			}
 
 			foreach ($areas as $area_index => $area) {
 				$area_content = '';
 				$target_elements = $target_order[$area_index];
 				foreach ($target_order[$area_index] as $old_location) {
 					$area_content .= $elements[$old_location]['data'] . $line_ending . "\t\t";
 				}
 
 				$mask = str_replace('#AREA' . $area_index . '#', trim($area_content), $mask);
 			}
 
 			$fp = fopen($filename, 'w');
 			fwrite($fp, $mask);
 			fclose($fp);
 
 			return true;
 		}
 
 		/**
 		 * Extracts div pairs with given class from given text
 		 *
 		 * @param string $data
 		 * @param string $class
 		 * @param int $area
 		 * @param int $offset
 		 * @return Array
 		 */
 		function _getDivPairs(&$data, $class, $area = null, $offset = 0)
 		{
 			preg_match_all('/(<div[^>]*>)|(<\/div>)/s', $data, $divs, PREG_SET_ORDER + PREG_OFFSET_CAPTURE);
 
 			$deep_level = 0;
 
 			$pairs = Array ();
 			$skip_count = Array (); // by deep level!
 
 			foreach ($divs as $div) {
 				if (strpos($div[0][0], '/') === false) {
 					// opening div
 					$skip_count[$deep_level] = 0;
 
 					if (strpos($div[0][0], $class) !== false) {
 						// ours opening (this deep level) -> save
 						$pair = Array ('open_pos' => $div[0][1], 'open_len' => strlen($div[0][0]));
 					}
 					else {
 						// not ours opening -> skip next closing (this deep level)
 						$skip_count[$deep_level]++;
 					}
 
 					$deep_level++;
 				}
 				else {
 					// closing div
 					$deep_level--;
 
 					if ($skip_count[$deep_level] == 0) {
 						// nothing to skip (this deep level) -> save
 						$pair['close_len'] = strlen($div[0][0]);
 						$pair['close_pos'] = $div[0][1] + $pair['close_len'];
 						$pair['data'] = substr($data, $pair['open_pos'], $pair['close_pos'] - $pair['open_pos']);
 
 						if (isset($area)) {
 							$pair['open_pos'] += $offset;
 							$pair['close_pos'] += $offset;
 							// index indicates area
 							$pairs['a' . $area . 'e' . count($pairs)] = $pair;
 						}
 						else {
 							$pairs[] = $pair;
 						}
 					}
 					else {
 						// skip closing div as requested
 						$skip_count[$deep_level]--;
 					}
 				}
 			}
 
 			return $pairs;
 		}
 
 		/**
 		 * Returns information about parser element locations in template
 		 *
 		 * @param string $info_type
 		 * @return mixed
 		 */
 		function blockInfo($info_type)
 		{
 			switch ($info_type) {
 				case 'block_name':
 					return $this->_blockName;
 					break;
 
 				case 'function_name':
 					return $this->_functionName;
 					break;
 
 				case 'start_pos':
 				case 'end_pos':
 				case 'template':
 					if (!array_key_exists($info_type, $this->_blockLocation)) {
 						// invalid block name
 						return 'invalid block name';
 					}
 
 					return $this->_blockLocation[$info_type];
 					break;
 
 				case 'template_file':
 					return $this->_getTemplateFile(true);
 					break;
 
 				case 'content':
 					$template_body = file_get_contents( $this->_getTemplateFile() );
 					$length = $this->_blockLocation['end_pos'] - $this->_blockLocation['start_pos'];
 
 					return substr($template_body, $this->_blockLocation['start_pos'], $length);
 					break;
 			}
 
 			return 'undefined';
 		}
 
 		/**
 		 * Main template being edited (parse copy, instead of original)
 		 *
 		 * @return bool
 		 */
 		function _isMainTemplate()
 		{
 			return $this->_blockLocation['template'] == $this->_sourceTemplate;
 		}
 
 		/**
 		 * Returns filename, that contains template, where block is located
 		 *
 		 * @param bool $relative
 		 * @param string $extension
 		 * @return string
 		 */
 		function _getTemplateFile($relative = false, $extension = '.tpl')
 		{
 			$filename = $this->Application->TemplatesCache->GetRealFilename( $this->_blockLocation['template'] ) . $extension;
 
 			if ($relative) {
 				$filename = preg_replace('/^' . preg_quote(FULL_PATH, '/') . '/', '', $filename, 1);
 			}
 
 			return $filename;
 		}
 
 		/**
 		 * Saves new version of block to template, where it's located
 		 *
 		 * @param kDBItem $object
 		 */
 		function saveBlock(&$object)
 		{
 			$main_template = $this->_isMainTemplate();
 			$filename = $this->_getTemplateFile(false);
 
 			// 1. get new template content
 			$new_template_body = $this->_getNewTemplateContent($object, $filename, $lines_before);
 			if (is_bool($new_template_body) && ($new_template_body === true)) {
 				// when nothing changed -> stop processing
 				return true;
 			}
 
 			// 2. backup original template
 			if (!$main_template && !copy($filename, $filename . '.bak')) {
 				// backup failed
 				$error_file = $this->_getTemplateFile(true, '.tpl.bak');
 				$object->SetError('FileContents', 'template_backup_failed', '+Failed to create backup template "<strong>' . $error_file . '</strong>" backup.');
 				return false;
 			}
 
 			// 3. save changed template
 			$save_filename = $this->_getTemplateFile(false, $main_template ? '.tmp.tpl' : '.tpl');
 			$fp = fopen($save_filename, 'w');
 			if (!$fp) {
 				// backup template create failed OR existing template save
 				$error_file = $this->_getTemplateFile(true, $main_template ? '.tmp.tpl' : '.tpl');
 				$object->SetError('FileContents', 'template_changes_save_failed', '+Failed to save template "<strong>' . $error_file . '</strong>" changes.');
 				return false;
 			}
 			fwrite($fp, $new_template_body);
 			fclose($fp);
 
 			// 3. parse template to check for errors
 			$this->_parseTemplate($object, $main_template ? '.tmp' : '');
 
 			if ($this->_parseErrors) {
 				$error_msg = Array ();
 				foreach ($this->_parseErrors as $error_data) {
 					if (preg_match('/line ([\d]+)/', $error_data['msg'], $regs)) {
 						// another line number inside message -> patch it
 						$error_data['msg'] = str_replace('line ' . $regs[1], 'line ' . ($regs[1] - $lines_before), $error_data['msg']);
 					}
 
 					$error_msg[] = $error_data['msg'] . ' at line ' . ($error_data['line'] - $lines_before);
 				}
 
 				$object->SetError('FileContents', 'template_syntax_error', '+Template syntax errors:<br/>' . implode('<br/>', $error_msg));
 				return false;
 			}
 
 			if ($main_template) {
 				// 4.1. replace original file with temporary
 				if (!rename($this->_getTemplateFile(false, '.tmp.tpl'), $filename)) {
 					// failed to save new content to original template
 					$error_file = $this->_getTemplateFile(true);
 					$object->SetError('FileContents', 'template_save_failed', '+Failed to save template "<strong>' . $error_file . '</strong>".');
 					return false;
 				}
 			}
 			else {
 				// 4.2. delete backup
 				unlink( $this->_getTemplateFile(false, '.tpl.bak') );
 			}
 
 			return true;
 		}
 
 		/**
 		 * Returns new template content of "true", when nothing is changed
 		 *
 		 * @param kDBItem $object
 		 * @param string $filename
 		 * @param int $lines_before
 		 * @return mixed
 		 */
 		function _getNewTemplateContent(&$object, $filename, &$lines_before)
 		{
 			$new_content = $object->GetDBField('FileContents');
 
 			$template_body = file_get_contents($filename);
 			$lines_before = substr_count(substr($template_body, 0,  $this->_blockLocation['start_pos']), "\n");
 
 			$new_template_body = 	substr($template_body, 0,  $this->_blockLocation['start_pos']) .
 									$new_content .
 									substr($template_body, $this->_blockLocation['end_pos']);
 
 			return crc32($template_body) == crc32($new_template_body) ? true : $new_template_body;
 		}
 	}
\ No newline at end of file
Index: branches/5.3.x/core/units/helpers/form_submission_helper.php
===================================================================
--- branches/5.3.x/core/units/helpers/form_submission_helper.php	(revision 16518)
+++ branches/5.3.x/core/units/helpers/form_submission_helper.php	(revision 16519)
@@ -1,160 +1,160 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class FormSubmissionHelper extends kHelper {
 
 		/**
 		 * Role names for easy usage via FormField tag
 		 *
 		 * @var Array
 		 */
 		var $roleNames = Array (
 			'name' => SubmissionFormField::COMMUNICATION_ROLE_NAME,
 			'email' => SubmissionFormField::COMMUNICATION_ROLE_EMAIL,
 			'subject' => SubmissionFormField::COMMUNICATION_ROLE_SUBJECT,
 			'body' => SubmissionFormField::COMMUNICATION_ROLE_BODY,
 		);
 
 		/**
 		 * Returns submission field based on given role
 		 *
 		 * @param kDBItem $form_submission
 		 * @param string $role
 		 * @param bool $formatted
 		 * @param string $format
 		 * @return string
 		 * @access public
 		 */
 		public function getFieldByRole(&$form_submission, $role, $formatted = false, $format = null)
 		{
 			$form_id = $form_submission->GetDBField('FormId');
 			$field_name = $this->getFieldNameByRole($form_id, $role);
 
 			if ( $field_name ) {
 				return $formatted ? $form_submission->GetField($field_name, $format) : $form_submission->GetDBField($field_name);
 			}
 
 			return false;
 		}
 
 		/**
 		 * Returns submission field name based on given role
 		 *
 		 * @param int $form_id
 		 * @param string $role
 		 * @return string
 		 * @access public
 		 */
 		public function getFieldNameByRole($form_id, $role)
 		{
 			static $cache = Array ();
 
 			if ( !array_key_exists($form_id, $cache) ) {
 				$config = $this->Application->getUnitConfig('formflds');
 
 				$sql = 'SELECT ' . $config->getIDField() . ', EmailCommunicationRole
 						FROM ' . $config->getTableName() . '
 						WHERE FormId = ' . $form_id . ' AND EmailCommunicationRole <> 0';
 				$cache[$form_id] = $this->Conn->GetCol($sql, 'EmailCommunicationRole');
 			}
 
 			// convert string representation of role to numeric
 			if ( !is_numeric($role) ) {
 				$role = strtolower($role);
 				$role = array_key_exists($role, $this->roleNames) ? $this->roleNames[$role] : false;
 			}
 
 			// get field name by role
 			return array_key_exists($role, $cache[$form_id]) ? 'fld_' . $cache[$form_id][$role] : false;
 		}
 
 		/**
 		 * Returns submission field based on given name
 		 *
 		 * @param kDBItem $form_submission
 		 * @param string $name
 		 * @param bool $formatted
 		 * @param string $format
 		 * @return string
 		 */
 		function getFieldByName(&$form_submission, $name, $formatted = false, $format = null)
 		{
 			static $cache = Array ();
 
 			$form_id = $form_submission->GetDBField('FormId');
 
 			if ( !array_key_exists($form_id, $cache) ) {
 				$config = $this->Application->getUnitConfig('formflds');
 
 				$sql = 'SELECT ' . $config->getIDField() . ', FieldName
 						FROM ' . $config->getTableName() . '
 						WHERE FormId = ' . $form_id;
 				$cache[$form_id] = $this->Conn->GetCol($sql, 'FieldName');
 			}
 
 			// get field by name
 			$field_id = array_key_exists($name, $cache[$form_id]) ? $cache[$form_id][$name] : false;
 
 			if ( $field_id ) {
 				return $formatted ? $form_submission->GetField('fld_' . $field_id, $format) : $form_submission->GetDBField('fld_' . $field_id);
 			}
 
 			return false;
 		}
 
 		/**
 		 * Returns form object field based on form submission
 		 *
 		 * @param $form_submission kDBItem
 		 * @return kDBItem
 		 */
 		function &getForm(&$form_submission)
 		{
 			$form_id = $form_submission->GetDBField('FormId');
 
+			/** @var kDBItem $form */
 			$form = $this->Application->recallObject('form', null, Array ('skip_autoload' => true));
-			/* @var $form kDBItem */
 
 			if ( !$form->isLoaded() || ($form->GetID() != $form_id) ) {
 				$form->Load($form_id);
 			}
 
 			return $form;
 		}
 
 		/**
 		 * Returns form submission based on given submission log
 		 *
 		 * @param kDBItem $submission_log
 		 * @return kDBItem
 		 * @access public
 		 */
 		public function getSubmissionFromLog($submission_log)
 		{
 			$submission_id = $submission_log->GetDBField('FormSubmissionId');
 
+			/** @var kDBItem $form_submission */
 			$form_submission = $this->Application->recallObject('formsubs.-item', null, Array ('skip_autoload' => true));
-			/* @var $form_submission kDBItem */
 
 			if ( $form_submission->isLoaded() && ($form_submission->GetID() == $submission_id) ) {
 				return $form_submission;
 			}
 
 			$form_submission->Load($submission_id);
 
 			return $form_submission;
 		}
 	}
Index: branches/5.3.x/core/units/helpers/navigation_bar.php
===================================================================
--- branches/5.3.x/core/units/helpers/navigation_bar.php	(revision 16518)
+++ branches/5.3.x/core/units/helpers/navigation_bar.php	(revision 16519)
@@ -1,381 +1,381 @@
 <?php
 /**
  * @version	$Id$
  * @package	In-Portal
  * @copyright	Copyright (C) 1997 - 2012 Intechnic. All rights reserved.
  * @license	  GNU/GPL
  * In-Portal is Open Source software.
  * This means that this software may have been modified pursuant
  * the GNU General Public License, and as distributed it includes
  * or is derivative of works licensed under the GNU General Public License
  * or other free or open source software licenses.
  * See http://www.in-portal.org/license for copyright notices and details.
  */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class kNavigationBar extends kBase {
 
 	/**
 	 * Parameters to indicate how exactly navigation bar should look like
 	 *
 	 * @var Array
 	 * @access protected
 	 */
 	protected $_params = Array ();
 
 	/**
 	 * Prints category path using given blocks. Also supports used defined path elements at the end.
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	public function build($params)
 	{
 		// elements:
 		// - current_render_as - currently selected element (automatic detection)
 		// - render_as - link to a regular template
 		// - category_render_as - link to category path element
 		// - custom_render_as - link to custom element (that have "__" in front of them)
 		// - root_cat_render_as - link to Home page
 
 		$this->_params = $params;
 		$this->_params['is_first'] = 1;
 
 		$home_element = $this->_getHomeElement();
 
 		if ( !getArrayValue($this->_params, 'titles') && !getArrayValue($this->_params, 'templates') ) {
 			// no static templates given, show only category path
 			return $home_element . $this->getCategoryPath();
 		}
 
 		$ret = '';
 		$block_params = $this->_getBaseParams();
 		$current_template = $this->_getCurrentTemplate();
 		$navigation_parts = $this->getNavigationParts();
 
 		foreach ($navigation_parts as $template => $title) {
 			$block_params['template'] = $template;
 
 			if ( $title == '__categorypath__' ) {
 				$ret .= $this->getCategoryPath();
 			}
 			else {
 				$is_current = $template == $current_template;
 				$block_params['current'] = $is_current;
 
 				if ( substr($title, 0, 2) == '__' ) {
 					$block_params['title'] = $title;
 					$block_params['name'] = $this->SelectParam($this->_params, 'custom_render_as,render_as');
 				}
 				else {
 					$block_params['title'] = $this->Application->Phrase($title);
 					$block_params['name'] = $this->_params[$is_current ? 'current_render_as' : 'render_as'];
 				}
 
 				$ret .= $this->Application->ParseBlock($block_params);
 			}
 		}
 
 		return $home_element . $ret;
 	}
 
 	/**
 	 * Returns base params for rendering each navigation bar element
 	 *
 	 * @return Array
 	 * @access protected
 	 */
 	protected function _getBaseParams()
 	{
 		$block_params = Array (
 			'no_editing' => 1,
 			'category' => 0,
 			'separator' => $this->_params['separator'],
 			'current' => 0,
 		);
 
 		return $block_params;
 	}
 
 	/**
 	 * Returns the name of current physical template
 	 *
 	 * @return string
 	 * @access protected
 	 */
 	protected function _getCurrentTemplate()
 	{
 		return $this->Application->getPhysicalTemplate($this->Application->GetVar('t'));
 	}
 
 	/**
 	 * Returns element for "Home" category
 	 *
 	 * @return string
 	 * @access protected
 	 */
 	protected function _getHomeElement()
 	{
 		if ( isset($this->_params['shift']) && $this->_params['shift'] ) {
 			$home_element = '';
 			$this->_params['shift']--;
 		}
 		else {
 			$home_element = $this->_getHomeCategoryPath();
 			unset($this->_params['is_first']);
 		}
 
 		return $home_element;
 	}
 
 	/**
 	 * Renders path to top catalog category
 	 *
 	 * @return string
 	 * @access protected
 	 */
 	protected function _getHomeCategoryPath()
 	{
 		$block_params = $this->_getBaseParams();
 		$block_params['cat_id'] = $this->Application->getBaseCategory();
 		$block_params['current'] = $this->_getCurrentCategoryId() == $block_params['cat_id'] ? 1 : 0;
 		$block_params['is_first'] = $this->_params['is_first'];
 		$block_params['template'] = ''; // to prevent warning when category element is rendered using general "render_as" block
 
 		$category_name = $this->Application->Phrase(($this->Application->isAdmin ? 'la_' : 'lu_') . 'rootcategory_name');
 		$block_params['cat_name'] = $block_params['title'] = $category_name;
 
 		$block_params['name'] = $this->SelectParam($this->_params, 'root_cat_render_as,category_render_as,render_as');
 
 		if ( $block_params['current'] ) {
 			$block_params['name'] = $this->SelectParam($this->_params, 'current_render_as,render_as');
 		}
 
 		return $this->Application->ParseBlock($block_params);
 	}
 
 	/**
 	 * Returns currently selected category
 	 *
 	 * @return mixed
 	 */
 	protected function _getCurrentCategoryId()
 	{
 		return isset($this->_params['cat_id']) ? $this->_params['cat_id'] : $this->Application->GetVar('m_cat_id');
 	}
 
 	/**
 	 * Get navigation parts
 	 *
 	 * @return Array
 	 * @access protected
 	 */
 	protected function getNavigationParts()
 	{
 		$titles = explode(',', $this->_params['titles']);
 		$templates = explode(',', $this->_params['templates']);
 
 		if ( getArrayValue($this->_params, 'show_category') && !in_array('__categorypath__', $titles) ) {
 			// insert before __item__ or first element, when __item__ isn't specified
 			$item_index = (int)array_search('__item__', $titles);
 			array_splice($titles, $item_index, 0, '__categorypath__');
 			array_splice($templates, $item_index, 0, '__categorypath__');
 		}
 
 		return array_combine($templates, $titles);
 	}
 
 	/**
 	 * Renders path to given category using given blocks.
 	 *
 	 * @return string
 	 * @access protected
 	 */
 	protected function getCategoryPath()
 	{
 		$category_path = $this->getCategoryParentPath();
 
 		if ( !$category_path ) {
 			// in "Home" category
 			return '';
 		}
 
 		$main_category_id = $this->_getCurrentCategoryId();
 
+		/** @var CategoryHelper $category_helper */
 		$category_helper = $this->Application->recallObject('CategoryHelper');
-		/* @var $category_helper CategoryHelper */
 
 		$module_info = $category_helper->getCategoryModule($this->_params, array_keys($category_path));
 		$module_item_id = $this->Application->GetVar($module_info['Var'] . '_id');
 
 		$ret = '';
 		$block_params = $this->_getBaseParams();
 		$block_params['category'] = 1;
 		$block_params['template'] = ''; // to prevent warning when category element is rendered using general "render_as" block
 
 		if ( isset($this->_params['is_first']) ) {
 			$block_params['is_first'] = $this->_params['is_first'];
 		}
 
 		$block_params['separator'] = $this->_params['separator'];
 		$no_current = isset($this->_params['no_current']) && $this->_params['no_current'];
 		$backup_category_id = $this->Application->GetVar('c_id');
 
 		foreach ($this->shiftCategoryPath($category_path) as $category_id => $category_name) {
 			$block_params['cat_id'] = $category_id;
 			$block_params['cat_name'] = $block_params['title'] = $category_name;
 
 			if ( $no_current ) {
 				$block_params['current'] = 0;
 			}
 			else {
 				$block_params['current'] = ($main_category_id == $category_id) && !$module_item_id ? 1 : 0;
 			}
 
 			$block_params['name'] = $this->SelectParam($this->_params, 'category_render_as,render_as');
 
 			if ( $block_params['current'] ) {
 				$block_params['name'] = $this->SelectParam($this->_params, 'current_render_as,render_as');
 			}
 
 			$this->Application->SetVar('c_id', $category_id);
 			$ret .= $this->Application->ParseBlock($block_params);
 
 			if ( array_key_exists('is_first', $block_params) ) {
 				unset($block_params['is_first']);
 			}
 		}
 
 		$this->Application->SetVar('c_id', $backup_category_id);
 
 		return $ret;
 	}
 
 	/**
 	 * Shift category path.
 	 *
 	 * @param array $category_path Category path.
 	 *
 	 * @return array
 	 */
 	protected function shiftCategoryPath(array $category_path)
 	{
 		if ( isset($this->_params['shift']) && $this->_params['shift'] ) {
 			return array_slice($category_path, $this->_params['shift'], null, true);
 		}
 
 		return $category_path;
 	}
 
 	/**
 	 * Returns given category's parent path as array of id=>name elements
 	 *
 	 * @return Array
 	 * @access protected
 	 */
 	protected function getCategoryParentPath()
 	{
 		$main_category_id = $this->_getCurrentCategoryId();
 
 		if ( $main_category_id == 0 ) {
 			// don't query path for "Home" category
 			return Array ();
 		}
 
 		$category_title = isset($this->_params['category_title']) ? $this->_params['category_title'] : 'Name';
 		$cache_key = 'parent_paths_named[%CIDSerial:' . $main_category_id . '%]:' . $category_title;
 		$cached_path = $this->Application->getCache($cache_key);
 
 		if ( $cached_path === false ) {
 			$parent_path = explode('|', substr($this->getParentPath($main_category_id), 1, -1));
 
+			/** @var kMultiLanguage $ml_formatter */
 			$ml_formatter = $this->Application->recallObject('kMultiLanguage');
-			/* @var $ml_formatter kMultiLanguage */
 
 			$navbar_field = $ml_formatter->LangFieldName($category_title);
 
 			$config = $this->Application->getUnitConfig('c');
 			$id_field = $config->getIDField();
 
 			$this->Conn->nextQueryCachable = true;
 			$sql = 'SELECT ' . $navbar_field . ', ' . $id_field . '
 					FROM ' . $config->getTableName() . '
 					WHERE ' . $id_field . ' IN (' . implode(',', $parent_path) . ')';
 			$category_names = $this->Conn->GetCol($sql, $id_field);
 
 			$cached_path = Array ();
 			$skip_category = $this->Application->getBaseCategory();
 
 			if ( $category_names ) {
 				foreach ($parent_path as $category_id) {
 					if ( $category_id == $skip_category ) {
 						continue;
 					}
 
 					$cached_path[$category_id] = $category_names[$category_id];
 				}
 			}
 
 			$this->Application->setCache($cache_key, $cached_path);
 		}
 
 		return $cached_path;
 	}
 
 	/**
 	 * Returns parent path from a given category
 	 *
 	 * @param int $category_id
 	 * @return string
 	 * @access public
 	 */
 	public function getParentPath($category_id)
 	{
 		$cache_key = 'parent_paths[%CIDSerial:' . $category_id . '%]';
 		$parent_path = $this->Application->getCache($cache_key);
 
 		if ( $parent_path !== false ) {
 			return $parent_path;
 		}
 
 		$config = $this->Application->getUnitConfig('c');
 
 		$this->Conn->nextQueryCachable = true;
 		$sql = 'SELECT ParentPath
 				FROM ' . $config->getTableName() . '
 				WHERE ' . $config->getIDField() . ' = ' . $category_id;
 		$parent_path = $this->Conn->GetOne($sql);
 
 		$this->Application->setCache($cache_key, $parent_path);
 
 		return $parent_path;
 	}
 
 	/**
 	 * Not tag. Method for parameter selection from list in this TagProcessor
 	 *
 	 * @param Array $params
 	 * @param Array $possible_names
 	 *
 	 * @return string
 	 * @access protected
 	 */
 	protected function SelectParam($params, $possible_names)
 	{
 		if ( !is_array($params) ) {
 			return '';
 		}
 		if ( !is_array($possible_names) ) {
 			$possible_names = explode(',', $possible_names);
 		}
 
 		foreach ($possible_names as $name) {
 			if ( isset($params[$name]) ) {
 				return $params[$name];
 			}
 		}
 
 		return '';
 	}
 }
Index: branches/5.3.x/core/units/helpers/themes_helper.php
===================================================================
--- branches/5.3.x/core/units/helpers/themes_helper.php	(revision 16518)
+++ branches/5.3.x/core/units/helpers/themes_helper.php	(revision 16519)
@@ -1,677 +1,677 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class kThemesHelper extends kHelper {
 
 		/**
 		 * Where all themes are located
 		 *
 		 * @var string
 		 */
 		var $themesFolder = '';
 
 		/**
 		 * List of theme names, found on system
 		 *
 		 * @var Array
 		 */
 		var $_themeNames = Array ();
 
 		/**
 		 * Temporary array when all theme files from db are stored
 		 *
 		 * @var Array
 		 */
 		var $themeFiles = Array ();
 
 		public function __construct()
 		{
 			parent::__construct();
 
 			$this->themesFolder = FULL_PATH.'/themes';
 		}
 
 		/**
 		 * Updates file system changes to database for selected theme
 		 *
 		 * @param string $theme_name
 		 *
 		 * @return mixed returns ID of created/used theme or false, if none created
 		 */
 		function refreshTheme($theme_name)
 		{
 			if (!file_exists($this->themesFolder . '/' . $theme_name)) {
 				// requested theme was not found on hdd
 				return false;
 			}
 
 			$config = $this->Application->getUnitConfig('theme');
 			$id_field = $config->getIDField();
 			$table_name = $config->getTableName();
 
 			$sql = 'SELECT *
 					FROM ' . $table_name . '
 					WHERE Name = ' . $this->Conn->qstr($theme_name);
 			$theme_info = $this->Conn->GetRow($sql);
 
 			if ($theme_info) {
 				$theme_id = $theme_info[$id_field];
 				$theme_enabled = $theme_info['Enabled'];
 			}
 			else {
 				$theme_id = $theme_enabled = false;
 			}
 
 			$this->themeFiles = Array ();
 			$theme_path = $this->themesFolder . '/' . $theme_name;
 
 			if ($theme_id) {
 				if (!$theme_enabled) {
 					// don't process existing theme files, that are disabled
 					return $theme_id;
 				}
 
 				// reset found mark for every themes file (if theme is not new)
 				$sql = 'UPDATE '.TABLE_PREFIX.'ThemeFiles
 						SET FileFound = 0
 						WHERE ThemeId = '.$theme_id;
 				$this->Conn->Query($sql);
 
 				// get all theme files from db
 				$sql = 'SELECT FileId, CONCAT(FilePath, "/", FileName) AS FullPath
 						FROM '.TABLE_PREFIX.'ThemeFiles
 						WHERE ThemeId = '.$theme_id;
 				$this->themeFiles = $this->Conn->GetCol($sql, 'FullPath');
 			}
 			else {
 				// theme was not found in db, but found on hdd -> create new
 				$config = $this->getConfiguration($theme_path);
 
 				$theme_info = Array (
 					 'Name' => $theme_name,
 					 'Enabled' => 0,
 					 'Description' => $theme_name,
 					 'PrimaryTheme' => 0,
 					 'CacheTimeout' => 3600, // not in use right now
 					 'StylesheetId' => 0,	  // not in use right now
 					 'LanguagePackInstalled' => 0,
 					 'StylesheetFile' => isset($config['stylesheet_file']) ? $config['stylesheet_file'] : '',
 				);
 
 				$this->Conn->doInsert($theme_info, $table_name);
 				$theme_id = $this->Conn->getInsertID();
 
 				if (!$theme_enabled) {
 					// don't process newly created theme files, because they are disabled
 					return $theme_id;
 				}
 			}
 
 			$this->_themeNames[$theme_id] = $theme_name;
 			$this->FindThemeFiles('', $theme_path, $theme_id); // search from base theme directory
 
 			// delete file records from db, that were not found on hdd
 			$sql = 'DELETE FROM '.TABLE_PREFIX.'ThemeFiles
 					WHERE ThemeId = '.$theme_id.' AND FileFound = 0';
 			$this->Conn->Query($sql);
 
 			// install language packs, associated with theme (if any found and wasn't aready installed)
 			if (!$theme_info['LanguagePackInstalled']) {
 				$this->installThemeLanguagePack($theme_path);
 
 				$fields_hash = Array (
 					'LanguagePackInstalled' => 1,
 				);
 
 				$this->Conn->doUpdate($fields_hash, $table_name, $id_field . ' = ' . $theme_id);
 			}
 
 			$this->_saveThemeSettings($theme_id, $theme_path);
 
 			return $theme_id;
 		}
 
 		/**
 		 * Saves information from "/_install/theme.xml" files in theme
 		 *
 		 * @param int $theme_id
 		 * @param string $theme_path
 		 * @return void
 		 * @access protected
 		 */
 		protected function _saveThemeSettings($theme_id, $theme_path)
 		{
 			$config = $this->Application->getUnitConfig('theme');
 			$id_field = $config->getIDField();
 			$table_name = $config->getTableName();
 
 			$this->Conn->doUpdate($this->_getThemeSettings($theme_id, $theme_path), $table_name, $id_field . ' = ' . $theme_id);
 		}
 
 		/**
 		 * Installs module(-s) language pack for given theme
 		 *
 		 * @param string $theme_path
 		 * @param string|bool $module_name
 		 * @return void
 		 */
 		function installThemeLanguagePack($theme_path, $module_name = false)
 		{
 			if ( $module_name === false ) {
 				$modules = $this->Application->ModuleInfo;
 			}
 			else {
 				$modules = Array ($module_name => $this->Application->ModuleInfo[$module_name]);
 			}
 
+			/** @var LanguageImportHelper $language_import_helper */
 			$language_import_helper = $this->Application->recallObject('LanguageImportHelper');
-			/* @var $language_import_helper LanguageImportHelper */
 
 			foreach ($modules as $module_name => $module_info) {
 				if ( $module_name == 'In-Portal' ) {
 					continue;
 				}
 
 				$lang_file = $theme_path . '/' . $module_info['TemplatePath'] . '_install/english.lang';
 
 				if ( file_exists($lang_file) ) {
 					$language_import_helper->performImport($lang_file, '|0|', '');
 				}
 			}
 		}
 
 		/**
 		 * Parses information, discovered from "/_install/theme.xml" files in theme
 		 *
 		 * @param int $theme_id
 		 * @param string $theme_path
 		 * @return Array
 		 * @access protected
 		 */
 		protected function _getThemeSettings($theme_id, $theme_path)
 		{
 			$setting_mapping = Array ('image_resize_rules' => 'ImageResizeRules');
 			$ret = Array ('TemplateAliases' => Array (), 'ImageResizeRules' => Array ());
 
 			foreach ($this->Application->ModuleInfo as $module_name => $module_info) {
 				$xml_file = $theme_path . '/' . $module_info['TemplatePath'] . '_install/theme.xml';
 
 				if ( $module_name == 'In-Portal' || !file_exists($xml_file) ) {
 					continue;
 				}
 
 				$theme = simplexml_load_file($xml_file);
 
 				if ( $theme === false ) {
 					// broken xml OR no aliases defined
 					continue;
 				}
 
 				foreach ($theme as $setting) {
-					/* @var $setting SimpleXMLElement */
+					/** @var SimpleXMLElement $setting */
 
 					$setting_name = $setting->getName();
 					$setting_value = trim($setting);
 
 					if ( isset($setting_mapping[$setting_name]) ) {
 						$ret[$setting_mapping[$setting_name]][] = $setting_value;
 						continue;
 					}
 
 					// this is template alias
 					$module_override = (string)$setting['module'];
 
 					if ( $module_override ) {
 						// allow to put template mappings form all modules into single theme.xml file
 						$module_folder = $this->Application->findModule('Name', $module_override, 'TemplatePath');
 					}
 					else {
 						// no module specified -> use module based on theme.xml file location
 						$module_folder = $module_info['TemplatePath'];
 					}
 
 					// only store alias, when template exists on disk
 					if ( $this->getTemplateId($setting_value, $theme_id) ) {
 						$alias = '#' . $module_folder . strtolower($setting->getName()) . '#';
 
 						// remember alias in global theme mapping
 						$ret['TemplateAliases'][$alias] = $setting_value;
 
 						// store alias in theme file record to use later in design dropdown
 						$this->updateTemplate($setting_value, $theme_id, Array ('TemplateAlias' => $alias));
 					}
 				}
 			}
 
 			$ret['TemplateAliases'] = serialize($ret['TemplateAliases']);
 			$ret['ImageResizeRules'] = implode("\n", array_filter($ret['ImageResizeRules']));
 
 			return $ret;
 		}
 
 		/**
 		 * Returns theme configuration.
 		 *
 		 * @param string $theme_path Absolute path to theme.
 		 *
 		 * @return array
 		 */
 		protected function getConfiguration($theme_path)
 		{
 			$xml_file = $theme_path . '/_install/theme.xml';
 
 			if ( !file_exists($xml_file) ) {
 				return array();
 			}
 
 			$theme = simplexml_load_file($xml_file);
 
 			if ( $theme === false ) {
 				// broken xml OR no aliases defined
 				return array();
 			}
 
 			$ret = array();
 
 			foreach ( $theme->attributes() as $name => $value ) {
 				$ret[(string)$name] = (string)$value;
 			}
 
 			return $ret;
 		}
 
 		/**
 		 * Returns ID of given physical template (relative to theme) given from ThemeFiles table
 		 * @param string $template_path
 		 * @param int $theme_id
 		 * @return int
 		 * @access public
 		 */
 		public function getTemplateId($template_path, $theme_id)
 		{
 			$template_path = $this->Application->getPhysicalTemplate($template_path);
 
 			$sql = 'SELECT FileId
 					FROM ' . TABLE_PREFIX . 'ThemeFiles
 					WHERE ' . $this->getTemplateWhereClause($template_path, $theme_id);
 
 			return $this->Conn->GetOne($sql);
 		}
 
 		/**
 		 * Updates template record with a given data
 		 *
 		 * @param string $template_path
 		 * @param int $theme_id
 		 * @param Array $fields_hash
 		 * @return void
 		 * @access public
 		 */
 		public function updateTemplate($template_path, $theme_id, $fields_hash)
 		{
 			$where_clause = $this->getTemplateWhereClause($template_path, $theme_id);
 			$this->Conn->doUpdate($fields_hash, TABLE_PREFIX . 'ThemeFiles', $where_clause);
 		}
 
 		/**
 		 * Returns where clause to get associated record from ThemeFiles table for given template path
 		 * @param string $template_path
 		 * @param int $theme_id
 		 * @return string
 		 * @access protected
 		 */
 		protected function getTemplateWhereClause($template_path, $theme_id)
 		{
 			$folder = dirname($template_path);
 
 			$where_clause = Array (
 				'ThemeId = ' . $theme_id,
 				'FilePath = ' . $this->Conn->qstr($folder == '.' ? '' : '/' . $folder),
 				'FileName = ' . $this->Conn->qstr(basename($template_path) . '.tpl'),
 			);
 
 			return '(' . implode(') AND (', $where_clause) . ')';
 		}
 
 		/**
 		 * Installs given module language pack and refreshed it from all themes
 		 *
 		 * @param string $module_name
 		 */
 		function synchronizeModule($module_name)
 		{
 			$sql = 'SELECT `Name`, ThemeId
 					FROM ' . TABLE_PREFIX . 'Themes';
 			$themes = $this->Conn->GetCol($sql, 'ThemeId');
 
 			if (!$themes) {
 				return ;
 			}
 
 			foreach ($themes as $theme_id => $theme_name) {
 				$theme_path = $this->themesFolder . '/' . $theme_name;
 
 				// install language pack
 				$this->installThemeLanguagePack($theme_path, $module_name);
 
 				// update TemplateAliases mapping
 				$this->_saveThemeSettings($theme_id, $theme_path);
 			}
 		}
 
 		/**
 		 * Searches for new templates (missing in db) in specified folder
 		 *
 		 * @param string $folder_path subfolder of searchable theme
 		 * @param string $theme_path theme path from web server root
 		 * @param int $theme_id id of theme we are scanning
 		 * @param int $auto_structure_mode
 		 */
 		function FindThemeFiles($folder_path, $theme_path, $theme_id, $auto_structure_mode = 1)
 		{
 			$ignore_regexp = $this->getIgnoreRegexp($theme_path . $folder_path);
 
 			$iterator = new DirectoryIterator($theme_path . $folder_path . '/');
-			/* @var $file_info DirectoryIterator */
+			/** @var DirectoryIterator $file_info */
 
 			foreach ($iterator as $file_info) {
 				$filename = $file_info->getFilename();
 				$auto_structure = preg_match($ignore_regexp, $filename) ? 2 : $auto_structure_mode;
 				$file_path = $folder_path . '/' . $filename; // don't pass path to theme top folder!
 
 				if ( $file_info->isDir() && !$file_info->isDot() && $filename != 'CVS' && $filename != '.svn' ) {
 					$this->FindThemeFiles($file_path, $theme_path, $theme_id, $auto_structure);
 				}
 				elseif ( pathinfo($filename, PATHINFO_EXTENSION) == 'tpl' ) {
 					$meta_info = $this->_getTemplateMetaInfo(trim($file_path, '/'), $theme_id);
 					$file_id = isset($this->themeFiles[$file_path]) ? $this->themeFiles[$file_path] : false;
 					$file_description = array_key_exists('desc', $meta_info) ? $meta_info['desc'] : '';
 
 					if ($file_id) {
 						// file was found in db & on hdd -> mark as existing
 						$fields_hash = Array (
 							'FileFound' => 1,
 							'Description' => $file_description,
 							'FileType' => $auto_structure,
 							'FileMetaInfo' => serialize($meta_info),
 						);
 
 						$this->Conn->doUpdate($fields_hash, TABLE_PREFIX . 'ThemeFiles', 'FileId = ' . $file_id);
 					}
 					else {
 						// file was found on hdd, but missing in db -> create new file record
 						$fields_hash = Array (
 							'ThemeId' => $theme_id,
 							'FileName' => $filename,
 							'FilePath' => $folder_path,
 							'Description' => $file_description,
 							'FileType' => $auto_structure, // 1 - built-in, 0 - custom (not in use right now), 2 - skipped in structure
 							'FileMetaInfo' => serialize($meta_info),
 							'FileFound' => 1,
 						);
 
 						$this->Conn->doInsert($fields_hash, TABLE_PREFIX.'ThemeFiles');
 						$this->themeFiles[$file_path] = $this->Conn->getInsertID();
 					}
 //					echo 'FilePath: [<strong>'.$folder_path.'</strong>]; FileName: [<strong>'.$filename.'</strong>]; IsNew: [<strong>'.($file_id > 0 ? 'NO' : 'YES').'</strong>]<br />';
 				}
 			}
 		}
 
 		/**
 		 * Returns single regular expression to match all ignore patters, that are valid for given folder
 		 *
 		 * @param string $folder_path
 		 * @return string
 		 */
 		protected function getIgnoreRegexp($folder_path)
 		{
 			// always ignore design and element templates
 			$ignore = '\.des\.tpl$|\.elm\.tpl$';
 			$sms_ignore_file = $folder_path . '/.smsignore';
 
 			if ( file_exists($sms_ignore_file) ) {
 				$manual_patterns = array_map('trim', file($sms_ignore_file));
 
 				foreach ($manual_patterns as $manual_pattern) {
 					$ignore .= '|' . str_replace('/', '\\/', $manual_pattern);
 				}
 			}
 
 			return '/' . $ignore . '/';
 		}
 
 		/**
 		 * Returns template information (name, description, path) from it's header comment
 		 *
 		 * @param string $template
 		 * @param int $theme_id
 		 * @return Array
 		 */
 		function _getTemplateMetaInfo($template, $theme_id)
 		{
 			static $init_made = false;
 			if (!$init_made) {
 				$this->Application->InitParser(true);
 				$init_made = true;
 			}
 
 			$template = 'theme:' . $this->_themeNames[$theme_id] . '/' . $template;
 			$template_file = $this->Application->TemplatesCache->GetRealFilename($template); // ".tpl" was added before
 
 			return $this->parseTemplateMetaInfo($template_file);
 		}
 
 		function parseTemplateMetaInfo($template_file)
 		{
 			if (!file_exists($template_file)) {
 				// when template without info it's placed in top category
 				return Array ();
 			}
 
 			$template_data = file_get_contents($template_file);
 
 			if (substr($template_data, 0, 6) == '<!--##') {
 				// template starts with comment in such format
 				/*<!--##
 				<NAME></NAME>
 				<DESC></DESC>
 				<SECTION>||</SECTION>
 				##-->*/
 
 				$comment_end = strpos($template_data, '##-->');
 				if ($comment_end === false) {
 					// badly formatted comment
 					return Array ();
 				}
 
 				$comment = trim( substr($template_data, 6, $comment_end - 6) );
 				if (preg_match_all('/<(NAME|DESC|SECTION)>(.*?)<\/(NAME|DESC|SECTION)>/is', $comment, $regs)) {
 					$ret = Array ();
 					foreach ($regs[1] as $param_order => $param_name) {
 						$ret[ strtolower($param_name) ] = trim($regs[2][$param_order]);
 					}
 
 					if (array_key_exists('section', $ret) && $ret['section']) {
 						$category_path = explode('||', $ret['section']);
 						$category_path = array_map('trim', $category_path);
 						$ret['section'] = implode('||', $category_path);
 					}
 
 					return $ret;
 				}
 			}
 
 			return Array ();
 		}
 
 		/**
 		 * Updates file system changes to database for all themes (including new ones)
 		 *
 		 */
 		function refreshThemes()
 		{
 			$themes_found = Array ();
 
 			try {
 				$iterator = new DirectoryIterator($this->themesFolder . '/');
-				/* @var $file_info DirectoryIterator */
+				/** @var DirectoryIterator $file_info */
 
 				foreach ($iterator as $file_info) {
 					$filename = $file_info->getFilename();
 
 					if ( $file_info->isDir() && !$file_info->isDot() && $filename != '.svn' && $filename != 'CVS' ) {
 						$theme_id = $this->refreshTheme($filename);
 
 						if ( $theme_id ) {
 							$themes_found[] = $theme_id;
 							// increment serial of updated themes
 							$this->Application->incrementCacheSerial('theme', $theme_id);
 						}
 					}
 				}
 			}
 			catch ( UnexpectedValueException $e ) {
 			}
 
 			$config = $this->Application->getUnitConfig('theme');
 			$id_field = $config->getIDField();
 			$table_name = $config->getTableName();
 
 			// 1. only one theme found -> enable it and make primary
 			/*if (count($themes_found) == 1) {
 				$sql = 'UPDATE ' . $table_name . '
 						SET Enabled = 1, PrimaryTheme = 1
 						WHERE ' . $id_field . ' = ' . current($themes_found);
 				$this->Conn->Query($sql);
 			}*/
 
 			// 2. if none themes found -> delete all from db OR delete all except of found themes
 			$sql = 'SELECT ' . $id_field . '
 					FROM ' . $table_name;
 			if ( $themes_found ) {
 				$sql .= ' WHERE ' . $id_field . ' NOT IN (' . implode(',', $themes_found) . ')';
 			}
 			$theme_ids = $this->Conn->GetCol($sql);
 			$this->deleteThemes($theme_ids);
 
 			foreach ($theme_ids as $theme_id) {
 				// increment serial of deleted themes
 				$this->Application->incrementCacheSerial('theme', $theme_id);
 			}
 
 			$this->Application->incrementCacheSerial('theme');
 			$this->Application->incrementCacheSerial('theme-file');
 
+			/** @var MinifyHelper $minify_helper */
 			$minify_helper = $this->Application->recallObject('MinifyHelper');
-			/* @var $minify_helper MinifyHelper */
 
 			$minify_helper->delete();
 		}
 
 		/**
 		 * Deletes themes with ids passed from db
 		 *
 		 * @param Array $theme_ids
 		 */
 		function deleteThemes($theme_ids)
 		{
 			if (!$theme_ids) {
 				return ;
 			}
 
 			$config = $this->Application->getUnitConfig('theme');
 			$id_field = $config->getIDField();
 
 			$sql = 'DELETE FROM '. $config->getTableName() .'
 					WHERE '.$id_field.' IN ('.implode(',', $theme_ids).')';
 			$this->Conn->Query($sql);
 
 			$sql = 'DELETE FROM '.TABLE_PREFIX.'ThemeFiles
 					WHERE '.$id_field.' IN ('.implode(',', $theme_ids).')';
 			$this->Conn->Query($sql);
 		}
 
 		/**
 		 * Returns current theme (also works in admin)
 		 *
 		 * @return int
 		 */
 		function getCurrentThemeId()
 		{
 			static $theme_id = null;
 
 			if (isset($theme_id)) {
 				return $theme_id;
 			}
 
 			if ($this->Application->isAdmin) {
 				// get theme, that user selected in catalog
 				$theme_id = $this->Application->RecallVar('theme_id');
 
 				if ($theme_id === false) {
 					// query, because "m_theme" is always empty in admin
 					$config = $this->Application->getUnitConfig('theme');
 
 					$sql = 'SELECT ' . $config->getIDField() . '
 							FROM ' . $config->getTableName() . '
 							WHERE (PrimaryTheme = 1) AND (Enabled = 1)';
 					$theme_id = $this->Conn->GetOne($sql);
 				}
 
 				return $theme_id;
 			}
 
 			// use current theme, because it's available on Front-End
 			$theme_id = $this->Application->GetVar('m_theme');
 			if (!$theme_id) {
 				// happens in mod-rewrite mode, then requested template is not found
 				$theme_id = $this->Application->GetDefaultThemeId();
 			}
 
 			return $theme_id;
 		}
 
 		/**
 		 * Returns page id based on given template
 		 *
 		 * @param string $template
 		 * @param int $theme_id
 		 * @return int
 		 */
 		function getPageByTemplate($template, $theme_id = null)
 		{
 			if (!isset($theme_id)) {
 				// during mod-rewrite url parsing current theme
 				// is not available to kHTTPQuery class, so don't use it
 				$theme_id = (int)$this->getCurrentThemeId();
 			}
 
 			$template_crc = kUtil::crc32(mb_strtolower($template));
 			$categories_config = $this->Application->getUnitConfig('c');
 
 			$sql = 'SELECT ' . $categories_config->getIDField() . '
 					FROM ' . $categories_config->getTableName() . '
 					WHERE
 						(
 							(NamedParentPathHash = ' . $template_crc . ') OR
 							(`Type` = ' . PAGE_TYPE_TEMPLATE . ' AND CachedTemplateHash = ' . $template_crc . ')
 						)
 						AND (ThemeId = ' . $theme_id . ($theme_id > 0 ? ' OR ThemeId = 0' : '') . ')';
 
 			return $this->Conn->GetOne($sql);
 		}
 	}
Index: branches/5.3.x/core/units/helpers/sections_helper.php
===================================================================
--- branches/5.3.x/core/units/helpers/sections_helper.php	(revision 16518)
+++ branches/5.3.x/core/units/helpers/sections_helper.php	(revision 16519)
@@ -1,365 +1,366 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	/**
 	 * Processes sections info from the configs
 	 *
 	 */
 	class kSectionsHelper extends kHelper {
 
 		/**
 		 * Holds information about all sections
 		 *
 		 * @var Array
 		 */
 		var $Tree = Array();
 
 		/**
 		 * Checks, that we are in debug mode
 		 *
 		 * @var bool
 		 */
 		var $debugMode = false;
 
 		/**
 		 * Checks, that we are in super admin mode
 		 *
 		 * @var bool
 		 */
 		var $superAdminMode = false;
 
 		public function __construct()
 		{
 			parent::__construct();
 
 			$this->debugMode = $this->Application->isDebugMode();
 			$this->superAdminMode = $this->Application->RecallVar('super_admin');
 		}
 
 		/**
 		 * Set's prefix and special
 		 *
 		 * @param string $prefix
 		 * @param string $special
 		 * @access public
 		 */
 		public function Init($prefix, $special)
 		{
 			parent::Init($prefix, $special);
 
 			$this->BuildTree();
 		}
 
 		/**
 		 * Builds xml for tree in left frame in admin
 		 *
 		 * @return void
 		 * @access public
 		 */
 		public function BuildTree()
 		{
 			if ( $this->Application->isCachingType(CACHING_TYPE_MEMORY) ) {
 				$data = $this->Application->getCache('master:sections_parsed', false, CacheSettings::$sectionsParsedRebuildTime);
 			}
 			else {
 				$data = $this->Application->getDBCache('sections_parsed', CacheSettings::$sectionsParsedRebuildTime);
 			}
 
 			if ( $data ) {
 				$this->Tree = unserialize($data);
 				return ;
 			}
 
 			if ( !defined('IS_INSTALL') || !IS_INSTALL ) {
 				// don't reread all configs during install, because they are reread on every install step
 				$this->Application->UnitConfigReader->ReReadConfigs();
 			}
 
 			$this->Tree = Array ();
 
 			// 1. build base tree (don't update parent with children list yet)
 			foreach ( $this->Application->UnitConfigReader->getUnitConfigsWithoutPriority() as $prefix ) {
 				$this->_processPrefixSections($prefix);
 			}
 
 			foreach ( $this->Application->UnitConfigReader->getUnitConfigsWithPriority() as $prefix ) {
 				$this->_processPrefixSections($prefix);
 			}
 
 			// 2. apply section adjustments
 			foreach ( $this->Application->UnitConfigReader->getPrefixes() as $prefix ) {
 				$config = $this->Application->getUnitConfig($prefix);
 
 				$section_adjustments = $config->getSectionAdjustments();
 
 				if ( !$section_adjustments ) {
 					continue;
 				}
 
 				foreach ($section_adjustments as $section_name => $adjustment_params) {
 					if ( is_array($adjustment_params) ) {
 						if ( !array_key_exists($section_name, $this->Tree) ) {
 							// don't process adjustments for non-existing sections
 							continue;
 						}
 
 						$this->Tree[$section_name] = kUtil::array_merge_recursive($this->Tree[$section_name], $adjustment_params);
 					}
 					else {
 						// then remove section
 						unset($this->Tree[$section_name]);
 					}
 				}
 			}
 
 			// 3.
 			foreach ($this->Tree as $section_name => $section_params) {
 				// 3.1. update parent -> children references
 				$parent_section = $section_params['parent'];
 				$section_order = "{$section_params['priority']}";
 
 				if ( !isset($parent_section) ) {
 					// don't process parent section of "in-portal:root" section
 					continue;
 				}
 
 				if ( !array_key_exists('children', $this->Tree[$parent_section]) ) {
 					$this->Tree[$parent_section]['children'] = Array ();
 				}
 
 				if ( array_key_exists($section_order, $this->Tree[$parent_section]['children']) ) {
 					trigger_error('Section "<strong>' . $section_name . '</strong>" has replaced section "<strong>' . $this->Tree[$parent_section]['children'][$section_order] . '</strong>" (parent section: "<strong>' . $parent_section . '</strong>"; duplicate priority: <strong>' . $section_order . '</strong>)', E_USER_WARNING);
 				}
 
 				$this->Tree[$parent_section]['children'][$section_order] = $section_name;
 
 				if ( $section_params['type'] == stTAB ) {
 					// if this is tab, then mark parent section as TabOnly
 					$this->Tree[$parent_section]['tabs_only'] = true;
 				}
 
 				// 3.2. process icons here, because they also can be adjusted
 				if ( isset($section_params['icon']) && preg_match('/([^:]+):(.*)/', $section_params['icon'], $regs) ) {
 					$this->Tree[$section_name]['icon'] = $regs[2];
 					$this->Tree[$section_name]['icon_module'] = $regs[1]; // set "icon_module" used in "combined_header" block
 					$module_folder = trim($this->Application->findModule('Name', $regs[1], 'Path'), '/');
 
 					if ( $module_folder == '' ) {
 						$module_folder = 'core';
 					}
 				}
 				else {
 					$module_folder = $this->Application->getUnitConfig($section_params['SectionPrefix'])->getModuleFolder();
 
 					if ( !array_key_exists('icon_module', $section_params) ) {
 						// set "icon_module" used in "combined_header" block
 						$this->Tree[$section_name]['icon_module'] = $this->Application->findModule('Path', $module_folder . '/', 'Name');
 					}
 				}
 
 				// this is to display HELP icon instead of missing one.. can be replaced with some other icon to draw attention
 				$icon_file = $module_folder . '/admin_templates/img/icons/icon24_' . $this->Tree[$section_name]['icon'];
 
 				/*$core_file = FULL_PATH.'/core/admin_templates/img/icons/icon24_' . $this->Tree[$section_name]['icon'].'.png';
 				if ($module_folder != 'core' && file_exists($core_file) && file_exists(FULL_PATH.'/'.$icon_file.'.png')) {
 					if (crc32(file_get_contents($core_file)) == crc32(file_get_contents(FULL_PATH.'/'.$icon_file.'.png'))) {
 						trigger_error('Section "<strong>' . $section_name . '</strong>" uses icon copy from "Core" module', E_USER_NOTICE);
 					}
 				}*/
 
 				if ( !file_exists(FULL_PATH . '/' . $icon_file . '.png') ) {
 					$this->Tree[$section_name]['icon'] = 'help';
 					$this->Tree[$section_name]['icon_module'] = 'core';
 				}
 			}
 
 			$this->Application->HandleEvent(new kEvent('adm:OnAfterBuildTree'));
 
 			if ( $this->Application->isCachingType(CACHING_TYPE_MEMORY) ) {
 				$this->Application->setCache('master:sections_parsed', serialize($this->Tree));
 			}
 			else {
 				$this->Application->setDBCache('sections_parsed', serialize($this->Tree));
 			}
 		}
 
 		function _processPrefixSections($prefix)
 		{
 			$config = $this->Application->getUnitConfig($prefix);
 			$sections = $config->getSections();
 
 			if ( !$sections ) {
 				return ;
 			}
 
 			foreach ($sections as $section_name => $section_params) {
 				// we could also skip not allowed sections here in future
 				if ( isset($section_params['SectionPrefix']) ) {
 					$section_prefix = $section_params['SectionPrefix'];
 				}
 				elseif ( $this->Application->getUnitConfig($prefix)->getSectionPrefix() ) {
 					$section_prefix = $this->Application->getUnitConfig($prefix)->getSectionPrefix();
 				}
 				else {
 					$section_prefix = $prefix;
 				}
 
 				if ( is_float($section_params['priority']) ) {
 					$section_params['priority'] = (string)$section_params['priority'];
 				}
 
 				$section_params['SectionPrefix'] = $section_prefix;
 				$section_params['url']['m_opener'] = 'r';
 				$section_params['url']['no_pass_through'] = 1;
 				$pass_section = getArrayValue($section_params, 'url', 'pass_section');
 
 				if ( $pass_section ) {
 					unset($section_params['url']['pass_section']);
 					$section_params['url']['section'] = $section_name;
 
 					if ( !isset($section_params['url']['module']) ) {
 						$module_name = $this->Application->findModule('Path', $config->getModuleFolder() . '/', 'Name');
 						$section_params['url']['module'] = $module_name;
 					}
 				}
 
 				if ( !isset($section_params['url']['t']) ) {
 					$section_params['url']['t'] = 'index';
 				}
 
 				if ( !isset($section_params['onclick']) ) {
 					$section_params['onclick'] = 'checkEditMode()';
 				}
 
 				if ( !isset($section_params['container']) ) {
 					$section_params['container'] = 0; // for js tree printing to xml
 				}
 
 				$current_data = isset($this->Tree[$section_name]) ? $this->Tree[$section_name] : Array ();
 
 				if ( $current_data ) {
 					trigger_error('Section "<strong>' . $section_name . '</strong>" declaration (originally defined in "<strong>' . $current_data['SectionPrefix'] . '</strong>") was overwriten from "<strong>' . $prefix . '</strong>"', E_USER_WARNING);
 				}
 
 				$this->Tree[$section_name] = kUtil::array_merge_recursive($current_data, $section_params);
 			}
 		}
 
 		/**
 		 * Returns details information about section
 		 *
 		 * @param string $section_name
 		 * @return Array
 		 */
 		function &getSectionData($section_name)
 		{
 			if (isset($this->Tree[$section_name])) {
 				$ret =& $this->Tree[$section_name];
 			}
 			else {
 				$ret = Array();
 			}
 			return $ret;
 		}
 
 		/**
 		 * Returns first child, that is not a folder
 		 *
 		 * @param string $section_name
 		 * @param bool $check_permission
 		 * @return string
 		 * @access public
 		 */
 		public function getFirstChild($section_name, $check_permission = false)
 		{
 			$section_data =& $this->getSectionData($section_name);
+
+			/** @var Array $children */
 			$children = isset($section_data['children']) && $section_data['children'] ? $section_data['children'] : false;
-			/* @var $children Array */
 
 			if ( $children ) {
 				// get 1st child
 				ksort($children, SORT_NUMERIC);
 				foreach ($children as $child_section) {
 					if ( !$this->sectionVisible($child_section, $check_permission) ) {
 						continue;
 					}
 
 					break;
 				}
 
 				return $this->getFirstChild($child_section, $check_permission);
 			}
 
 			return $section_name;
 		}
 
 		/**
 		 * Checks if given section is visible by it's definition and optionally by user permission
 		 *
 		 * @param string $section_name
 		 * @param bool $check_permission
 		 * @return bool
 		 */
 		function sectionVisible($section_name, $check_permission = false)
 		{
 			$section_data =& $this->getSectionData($section_name);
 
 			if (isset($section_data['show_mode']) && is_numeric($section_data['show_mode'])) {
 				$show_mode = $section_data['show_mode'];
 
 				// if super admin section -> show in super admin mode & debug mode
 				$show_section = $show_mode == smNORMAL || ((($show_mode & smSUPER_ADMIN) == smSUPER_ADMIN) && ($this->superAdminMode || $this->debugMode));
 
 				if (!$show_section) {
 					// if section is in debug mode only && debug mode -> show
 					$show_section = (($show_mode & smDEBUG) == smDEBUG) && $this->debugMode;
 				}
 
 				if (!$show_section) {
 					// visibility by section definition
 					return false;
 				}
 			}
 
 			// visibility by section permission
 			if ($check_permission) {
 				$perm_section = $this->getPermSection($section_name);
 
 				return $this->Application->CheckPermission($perm_section.'.view');
 			}
 
 			return true;
 		}
 
 		/**
 		 * Returns section for permission checking based on given section
 		 *
 		 * @param string $section_name
 		 * @return string
 		 */
 		function getPermSection($section_name)
 		{
 			$ret = $section_name;
 			$section_data =& $this->getSectionData($section_name);
 
 			if ($section_data && isset($section_data['perm_prefix'])) {
 				// this section uses other section permissions
 				$ret = $this->Application->getUnitConfig($section_data['perm_prefix'])->getPermSectionByName('main');
 			}
 
 			return $ret;
 		}
 	}
Index: branches/5.3.x/core/units/selectors/selectors_tag_processor.php
===================================================================
--- branches/5.3.x/core/units/selectors/selectors_tag_processor.php	(revision 16518)
+++ branches/5.3.x/core/units/selectors/selectors_tag_processor.php	(revision 16519)
@@ -1,118 +1,118 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class SelectorsTagProcessor extends kDBTagProcessor {
 
 		function PrintStyle($params)
 		{
+			/** @var SelectorsItem $object */
 			$object = $this->getObject($params);
-			/* @var $object SelectorsItem */
 
 			$style_data = $object->GetDBField( $params['field'] );
 
 			$ret = $object->CompileStyleBody( getArrayValue($params,'inline') ? STYLE_INLINE : STYLE_PREVIEW );
 
 			return $ret;
 		}
 
 		/**
 		 * Returns input field name to
 		 * be placed on form (for correct
 		 * event processing)
 		 *
 		 * @param Array $params
 		 * @return string
 		 * @access public
 		 */
 		function InputName($params)
 		{
 			$ret = parent::InputName($params);
 			$subfield = getArrayValue($params,'subfield');
 			if($subfield && $subfield != '$subfield')
 			{
 				$ret .= '['.$subfield.']';
 			}
 			return $ret;
 		}
 
 		function Field($params)
 		{
 			$subfield = getArrayValue($params,'subfield');
 			if($subfield && $subfield != '$subfield')
 			{
 				$params['no_special'] = 'no_special';
 			}
 			$ret = parent::Field($params);
 			if($subfield && $subfield != '$subfield')
 			{
 				$ret = getArrayValue($ret,$subfield);
 				return $ret !== false ? $ret : '';
 			}
 			return $ret;
 		}
 
 		/**
 		 * Prints list a all possible field options
 		 *
 		 * @param Array $params
 		 * @return string
 		 * @access protected
 		 */
 		protected function PredefinedOptions($params)
 		{
 			$field = $params['field'];
 
+			/** @var kDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBItem */
 
 			$value = $object->GetDBField($field);
 			$subfield = getArrayValue($params, 'subfield');
 
 			if ( $subfield && $subfield != '$subfield' ) {
 				$value = $value[$subfield];
 			}
 
 			$value_field = getArrayValue($params, 'value_field');
 			if ( !$value_field ) {
 				$value_field = $field;
 			}
 
 			$block_params['name'] = $params['block'];
 			$block_params['field'] = $params['field'];
 			$block_params['pass_params'] = 'true';
 
 			$selected_param_name = getArrayValue($params, 'selected_param');
 			if ( !$selected_param_name ) {
 				$selected_param_name = $params['selected'];
 			}
 			$selected = $params['selected'];
 
 			$o = '';
 			$options = $object->GetFieldOption($value_field, 'options');
 
 			foreach ($options as $key => $val) {
 				$block_params['key'] = $key;
 				$block_params['option'] = $val;
 				$block_params['field_name'] = $this->InputName($params);
 				$block_params[$selected_param_name] = ($key == $value ? ' ' . $selected : '');
 				$block_params['PrefixSpecial'] = $this->getPrefixSpecial();
 				$o .= $this->Application->ParseBlock($block_params, 1);
 			}
 
 			return $o;
 		}
 
 	}
\ No newline at end of file
Index: branches/5.3.x/core/units/selectors/selectors_event_handler.php
===================================================================
--- branches/5.3.x/core/units/selectors/selectors_event_handler.php	(revision 16518)
+++ branches/5.3.x/core/units/selectors/selectors_event_handler.php	(revision 16519)
@@ -1,462 +1,462 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 	class SelectorsEventHandler extends kDBEventHandler
 	{
 		/**
 		 * Allows to override standard permission mapping
 		 *
 		 * @return void
 		 * @access protected
 		 * @see kEventHandler::$permMapping
 		 */
 		protected function mapPermissions()
 		{
 			parent::mapPermissions();
 
 			$permissions = Array(
 				'OnResetToBase'		=>	Array('subitem' => 'add|edit'),
 				'OnMassResetToBase'	=>	Array('subitem' => 'add|edit'),
 
 				'OnOpenStyleEditor'	=>	Array('subitem' => 'add|edit'),
 				'OnSaveStyle'		=>	Array('subitem' => 'add|edit'),
 			);
 
 			$this->permMapping = array_merge($this->permMapping, $permissions);
 		}
 
 		/**
 		 * Occurs before an item has been cloned
 		 * Id of newly created item is passed as event' 'id' param
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeClone(kEvent $event)
 		{
 			parent::OnBeforeClone($event);
 
 			$event->Init($event->Prefix, '-item');
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$title_field = 'SelectorName';
 			$new_name = $object->GetDBField($title_field);
 			$original_checked = false;
 
 			$foreign_key = $event->getEventParam('foreign_key'); // in case if whole stylesheet is cloned
 			if ( $foreign_key === false ) {
 				$foreign_key = $object->GetDBField('StylesheetId');
 			} // in case if selector is copied ifself
 
 			do {
 				if ( preg_match('/(.*)-([\d]+)/', $new_name, $regs) ) {
 					$new_name = $regs[1] . '-' . ($regs[2] + 1);
 				}
 				elseif ( $original_checked ) {
 					$new_name = $new_name . '-1';
 				}
 
 				// if we are cloning in temp table this will look for names in temp table,
 				// since object' TableName contains correct TableName (for temp also!)
 				// if we are cloning live - look in live
 				$query = '	SELECT ' . $title_field . '
 							FROM ' . $object->TableName . '
 							WHERE ' . $title_field . ' = ' . $this->Conn->qstr($new_name) . ' AND StylesheetId = ' . $foreign_key;
 
 				$res = $this->Conn->GetOne($query);
 
 				/*// if not found in live table, check in temp table if applicable
 				if ($res === false && $object->Special == 'temp') {
 					$query = 'SELECT '.$name_field.' FROM '.$this->GetTempName($master['TableName']).'
 										WHERE '.$name_field.' = '.$this->Conn->qstr($new_name);
 					$res = $this->Conn->GetOne($query);
 				}*/
 
 				$original_checked = true;
 			} while ( $res !== false );
 			$object->SetDBField($title_field, $new_name);
 		}
 
 		/**
 		 * Show base styles or block styles
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
 		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			switch ($event->Special) {
 				case 'base':
 					$object->addFilter('type_filter', '%1$s.Type = 1');
 					break;
 
 				case 'block':
 					$object->addFilter('type_filter', '%1$s.Type = 2');
 					break;
 			}
 		}
 
 		/**
 		 * Occurs before updating item
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemUpdate(kEvent $event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
 			$this->SerializeSelectorData($event);
 		}
 
 		/**
 		 * Occurs before creating item
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemCreate(kEvent $event)
 		{
 			parent::OnBeforeItemCreate($event);
 
 			$this->SerializeSelectorData($event);
 		}
 
 		/**
 		 * Occurs after updating item
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemUpdate(kEvent $event)
 		{
 			parent::OnAfterItemUpdate($event);
 
 			$this->UnserializeSelectorData($event);
 		}
 
 		/**
 		 * Occurs after creating item
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemCreate(kEvent $event)
 		{
 			parent::OnAfterItemCreate($event);
 
 			$this->UnserializeSelectorData($event);
 		}
 
 		/**
 		 * Returns special of main item for linking with sub-item
 		 *
 		 * @param kEvent $event
 		 * @return string
 		 * @access protected
 		 */
 		protected function getMainSpecial(kEvent $event)
 		{
 			return '';
 		}
 
 		/**
 		 * Save css-style name & description before opening css editor
 		 *
 		 * @param kEvent $event
 		 */
 		function OnOpenStyleEditor($event)
 		{
 			$this->SaveChanges($event);
 			$event->redirect = false;
 		}
 
 		/**
 		 * Saves Changes to Item
 		 *
 		 * @param kEvent $event
 		 */
 		function SaveChanges($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject( Array('skip_autoload' => true) );
-			/* @var $object kDBItem */
 
 			$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
 			if ( $items_info ) {
 				list($id, $field_values) = each($items_info);
 
 				if ( $id == 0 ) {
 					$parent_id = getArrayValue($field_values, 'ParentId');
 					if ( $parent_id ) {
 						$object->Load($parent_id);
 					}
 
 					$object->setID(0);
 					$object->SetFieldsFromHash($field_values);
 					$event->setEventParam('form_data', $field_values);
 					$object->Create();
 
 					$this->Application->SetVar($event->getPrefixSpecial() . '_id', $object->GetID());
 				}
 				else {
 					$object->Load($id);
 					$object->SetFieldsFromHash($field_values);
 					$event->setEventParam('form_data', $field_values);
 					$object->Update();
 				}
 			}
 		}
 
 		/**
 		 * Save style changes from style editor
 		 *
 		 * @param kEvent $event
 		 */
 		function OnSaveStyle($event)
 		{
 			$this->SaveChanges($event);
 
 			$object = $event->getObject();
 			$this->Application->SetVar($event->getPrefixSpecial().'_id', $object->GetId() );
 
 			$this->finalizePopup($event);
 		}
 
 		/**
 		 * Extract styles
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemLoad(kEvent $event)
 		{
 			parent::OnAfterItemLoad($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$selector_data = $object->GetDBField('SelectorData');
 
 			if ( $selector_data ) {
 				$selector_data = unserialize($selector_data);
 				$object->SetDBField('SelectorData', $selector_data);
 			}
 			else {
 				$selector_data = Array ();
 			}
 
 			$this->AddParentProperties($event, $selector_data);
 		}
 
 		/**
 		 * Serialize item before saving to db
 		 *
 		 * @param kEvent $event
 		 */
 		function SerializeSelectorData($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$selector_data = $object->GetDBField('SelectorData');
 			if ( !$selector_data ) {
 				$selector_data = Array ();
 			}
 
 			$selector_data = $this->RemoveParentProperties($event, $selector_data);
 
 			if ( !kUtil::IsSerialized($selector_data) ) {
 				$selector_data = serialize($selector_data);
 			}
 
 			$object->SetDBField('SelectorData', $selector_data);
 		}
 
 		/**
 		 * Unserialize data back when update was made
 		 *
 		 * @param kEvent $event
 		 */
 		function UnserializeSelectorData($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$selector_data = $object->GetDBField('SelectorData');
 
 			if ( !$selector_data ) {
 				$selector_data = Array ();
 			}
 
 			if ( kUtil::IsSerialized($selector_data) ) {
 				$selector_data = unserialize($selector_data);
 			}
 
 			$selector_data = $this->AddParentProperties($event, $selector_data);
 
 			$object->SetDBField('SelectorData', $selector_data);
 		}
 
 		/**
 		 * Populate options based on temporary table :)
 		 *
 		 * @param kEvent $event
 		 */
 		function OnPrepareBaseStyles($event)
 		{
 			$object = $event->getObject();
 
 			$parent_info = $object->getLinkedInfo();
 			$title_field = $event->getUnitConfig()->getTitleField();
 
 			$sql = 'SELECT '.$title_field.', '.$object->IDField.'
 					FROM '.$object->TableName.'
 					WHERE Type = 1 AND StylesheetId = '.$parent_info['ParentId'].'
 					ORDER BY '.$title_field;
 			$options = $this->Conn->GetCol($sql,$object->IDField);
 
 			$object->SetFieldOption('ParentId', 'options', $options);
 		}
 
 		/**
 		 * Remove properties of parent style that match by value from style
 		 *
 		 * @param kEvent $event
 		 * @param Array $selector_data
 		 * @return Array
 		 */
 		function RemoveParentProperties($event, $selector_data)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$parent_id = $object->GetDBField('ParentId');
 
 			if ( $parent_id ) {
 				$sql = 'SELECT SelectorData
 						FROM ' . $object->TableName . '
 						WHERE ' . $object->IDField . ' = ' . $parent_id;
 				$base_selector_data = $this->Conn->GetOne($sql);
 
 				if ( kUtil::IsSerialized($base_selector_data) ) {
 					$base_selector_data = unserialize($base_selector_data);
 				}
 
 				foreach ($selector_data as $prop_name => $prop_value) {
 					if ( !$prop_value || getArrayValue($base_selector_data, $prop_name) == $prop_value ) {
 						unset($selector_data[$prop_name]);
 					}
 				}
 			}
 			else {
 				foreach ($selector_data as $prop_name => $prop_value) {
 					if ( !$prop_value ) {
 						unset($selector_data[$prop_name]);
 					}
 				}
 			}
 
 			$object->SetDBField('SelectorData', $selector_data);
 
 			return $selector_data;
 		}
 
 		/**
 		 * Add back properties from parent style, that match this style property values
 		 *
 		 * @param kEvent $event
 		 * @param Array $selector_data
 		 * @return Array
 		 */
 		function AddParentProperties($event, $selector_data)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$parent_id = $object->GetDBField('ParentId');
 			if ( $parent_id ) {
 				$sql = 'SELECT SelectorData
 						FROM ' . $object->TableName . '
 						WHERE ' . $object->IDField . ' = ' . $parent_id;
 				$base_selector_data = $this->Conn->GetOne($sql);
 
 				if ( kUtil::IsSerialized($base_selector_data) ) {
 					$base_selector_data = unserialize($base_selector_data);
 				}
 
 				$selector_data = kUtil::array_merge_recursive($base_selector_data, $selector_data);
 				$object->SetDBField('SelectorData', $selector_data);
 
 				return $selector_data;
 			}
 
 			return Array ();
 		}
 
 		/**
 		 * Reset Style definition to base style -> no customizations
 		 *
 		 * @param kEvent $event
 		 */
 		function OnResetToBase($event)
 		{
+			/** @var SelectorsItem $object */
 			$object = $event->getObject();
-			/* @var $object SelectorsItem */
 
 			$field_values = $this->getSubmittedFields($event);
 			$object->SetFieldsFromHash($field_values);
 			$event->setEventParam('form_data', $field_values);
 
 			$object->ResetStyle();
 
 			$event->SetRedirectParam('pass', 'all,' . $event->getPrefixSpecial());
 		}
 
 		/**
 		 * Resets selected styles properties to values of their base classes
 		 *
 		 * @param kEvent $event
 		 */
 		function OnMassResetToBase($event)
 		{
+			/** @var SelectorsItem $object */
 			$object = $event->getObject( Array('skip_autoload' => true) );
-			/* @var $object SelectorsItem */
 
 			$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
 
 			if ( $items_info ) {
 				foreach ($items_info as $id => $field_values) {
 					$object->Load($id);
 					$object->ResetStyle();
 				}
 			}
 		}
 	}
Index: branches/5.3.x/core/units/fck/fck_eh.php
===================================================================
--- branches/5.3.x/core/units/fck/fck_eh.php	(revision 16518)
+++ branches/5.3.x/core/units/fck/fck_eh.php	(revision 16519)
@@ -1,259 +1,259 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class FckEventHandler extends kDBEventHandler {
 
 		/**
 		 * Allows to override standard permission mapping
 		 *
 		 * @return void
 		 * @access protected
 		 * @see kEventHandler::$permMapping
 		 */
 		protected function mapPermissions()
 		{
 			parent::mapPermissions();
 
 			$permissions = Array (
 				'OnGetsEditorStyles' => Array ('self' => true),
 			);
 
 			$this->permMapping = array_merge($this->permMapping, $permissions);
 		}
 
 		/**
 		 * Checks user permission to execute given $event
 		 *
 		 * @param kEvent $event
 		 * @return bool
 		 * @access public
 		 */
 		public function CheckPermission(kEvent $event)
 		{
 			if ( $this->Application->isAdminUser || $event->Name == 'OnGetsEditorStyles' ) {
 				// this limits all event execution only to logged-in users in admin
 				return true;
 			}
 
 			return parent::CheckPermission($event);
 		}
 
 		function CreateXmlHeader()
 		{
 			ob_end_clean() ;
 			// Prevent the browser from caching the result.
 			// Date in the past
 			header('Expires: Mon, 26 Jul 1997 05:00:00 GMT') ;
 			// always modified
 			header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT') ;
 			// HTTP/1.1
 			header('Cache-Control: no-store, no-cache, must-revalidate') ;
 			header('Cache-Control: post-check=0, pre-check=0', false) ;
 			// HTTP/1.0
 			header('Pragma: no-cache') ;
 			// Set the response format.
 
 			$this->Application->setContentType('text/xml');
 			// Create the XML document header.
 		}
 
 		function OnLoadCmsTree($event)
 		{
 			$event->status = kEvent::erSTOP;
 
+			/** @var CategoryHelper $category_helper */
 			$category_helper = $this->Application->recallObject('CategoryHelper');
-			/* @var $category_helper CategoryHelper */
 
 			$pages = $category_helper->getStructureTreeAsOptions();
 
 			$sql = 'SELECT NamedParentPath, CategoryId
 					FROM ' . TABLE_PREFIX . 'Categories
 					WHERE CategoryId IN (' . implode(',', array_keys($pages)) . ')';
 			$templates = $this->Conn->GetCol($sql, 'CategoryId');
 
 			$templates[$this->Application->getBaseCategory()] .= '/Index'; // "Content" category will act as "Home Page"
 
 			$res = '<?xml version="1.0" encoding="' . CHARSET . '" ?>' . "\n";
 			$res .= '<CmsPages>' . "\n";
 
 			foreach ($pages as $id => $title) {
 				$template = $templates[$id];
 				$page_path = preg_replace('/^Content\//i', '', strtolower($template).'.html');
 
 				$title = $title . ' (' . $page_path . ')';
 				$real_url = $this->Application->HREF($template, '_FRONT_END_', array('pass' => 'm'), 'index.php');
 
 				$res .= '<CmsPage real_url="' . kUtil::escape($real_url, kUtil::ESCAPE_HTML) . '" path="@@' . $id . '@@" title="' . kUtil::escape($title, kUtil::ESCAPE_HTML) . '" st_id="' . $id . '" serverpath="" />' . "\n";
 			}
 
 			$res.= "</CmsPages>";
 
 			$this->CreateXmlHeader();
 			echo $res;
 		}
 
 		function OnRenameFile($event)
 		{
 			$event->status = kEvent::erSTOP;
 
 			if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
 				return;
 			}
 
 			$old_name = $this->Application->GetVar('old_name');
 			$new_name = $this->Application->GetVar('new_name');
 			$folder = $this->Application->GetVar('folder');
 			$sServerDir = WRITEABLE . '/user_files/' . $folder . '/';
 
 			if (!file_exists($sServerDir.$old_name) || !is_file($sServerDir.$old_name)) {
 				echo 204;
 				return;
 			}
 
+			/** @var fckFCKHelper $fck_helper */
 			$fck_helper = $this->Application->recallObject('FCKHelper');
-			/* @var $fck_helper fckFCKHelper*/
 
 			if ( !$fck_helper->IsAllowedExtension($folder, $new_name) ) {
 				echo 203;
 				return;
 			}
 
 			if ( !rename($sServerDir . $old_name, $sServerDir . $new_name) ) {
 //			echo $sServerDir.$old_name.' -> '.$sServerDir.$new_name;
 				echo 205;
 				return;
 			}
 
 			echo '0';
 		}
 
 
 		function OnDeleteFiles($event)
 		{
 			$event->status = kEvent::erSTOP;
 
 			if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
 				return;
 			}
 
 			$files = trim($this->Application->GetVar('files'),'|');
 	//		echo $files;
 			$a_files = explode('|', $files);
 			$folder = $this->Application->GetVar('folder');
 			$sServerDir = WRITEABLE . '/user_files/' . $folder . '/';
 
 			foreach ($a_files AS $file) {
 				@unlink($sServerDir.$file);
 			}
 
 	//		print_r($a_files);
 		}
 
 		function OnGetFoldersFilesList($event)
 		{
 			$this->CreateXmlHeader();
 
+			/** @var fckFCKHelper $fck_helper */
 			$fck_helper = $this->Application->recallObject('FCKHelper');
-			/* @var $fck_helper fckFCKHelper */
 
 			$ret = '<?xml version="1.0" encoding="' . CHARSET . '" ?>'."\n" ;
 			$ret .= "<content>"."\n";
 			$ret .= $fck_helper->PrintFolders();
 			$ret .= $fck_helper->PrintFiles();
 			$ret .= "</content>"."\n";
 			echo $ret;
 			exit;
 		}
 
 
 		function OnCreateFolder($event)
 		{
 			$event->status = kEvent::erSTOP;
 
 			if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
 				return;
 			}
 
 			$new_folder 	= $this->Application->GetVar('new_folder');
 			$current_folder	= $this->Application->GetVar('current_folder');
 			$folderPath = WRITEABLE . '/user_files' . '/' . $current_folder . "/" . $new_folder;
 			if ( file_exists( $folderPath ) && is_dir($folderPath)) {
 				echo "101";
 			}
 
 			if ( !file_exists( $folderPath ) )
 			{
 				// Turn off all error reporting.
 				error_reporting( 0 ) ;
 				// Enable error tracking to catch the error.
 				ini_set( 'track_errors', '1' ) ;
 				// To create the folder with 0777 permissions, we need to set umask to zero.
 				$oldumask = umask(0) ;
 				mkdir( $folderPath, 0777 ) ;
 				umask( $oldumask ) ;
 				$sErrorMsg = $php_errormsg ;
 				// Restore the configurations.
 				ini_restore( 'track_errors' ) ;
 				ini_restore( 'error_reporting' ) ;
 				if ($sErrorMsg)
 					echo  $sErrorMsg ;
 				else
 					echo '0';
 			}
 		}
 
 		/**
 		 * Uploads a file from FCK file browser
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnUploadFile(kEvent $event)
 		{
 			$event->status = kEvent::erSTOP;
 
 			if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
 				return;
 			}
 
+			/** @var fckFCKHelper $fck_helper */
 			$fck_helper = $this->Application->recallObject('FCKHelper');
-			/* @var $fck_helper fckFCKHelper*/
 
 			$fck_helper->UploadFile();
 		}
 
 		/**
 		 * Returns compressed CSS file
 		 *
 		 * @param kEvent $event
 		 */
 		function OnGetsEditorStyles($event)
 		{
 			kUtil::safeDefine('DBG_SKIP_REPORTING', 1);
 
 			/** @var ThemeItem $theme */
 			$theme = $this->Application->recallObject('theme.current');
 
 			/** @var MinifyHelper $minify_helper */
 			$minify_helper = $this->Application->recallObject('MinifyHelper');
 
 			$this->Application->InitParser();
 			$styles_css = $minify_helper->CompressScriptTag(array('files' => $theme->getStylesheetFile(true)));
 
 			$event->redirect = 'external:' . $styles_css;
 		}
 	}
Index: branches/5.3.x/core/units/fck/fck_tp.php
===================================================================
--- branches/5.3.x/core/units/fck/fck_tp.php	(revision 16518)
+++ branches/5.3.x/core/units/fck/fck_tp.php	(revision 16519)
@@ -1,44 +1,44 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class FckTagProcessor extends kDBTagProcessor {
 
 		protected function CheckCreateDefaultFolders(Array $params)
 		{
+			/** @var fckFCKHelper $fck_helper */
 			$fck_helper = $this->Application->recallObject('FCKHelper');
-			/* @var $fck_helper fckFCKHelper */
 
 			$default_folders = defined('FCK_DEFAULT_FOLDERS') ? FCK_DEFAULT_FOLDERS : Array ('Files', 'Images', 'Flash', 'Media', 'Documents');
 
 			foreach ($default_folders as $index => $folder) {
 				if ( !$fck_helper->CreateFolder($folder) ) {
 					unset($default_folders[$index]);
 				}
 			}
 
 			if ( !$default_folders ) {
 				return '';
 			}
 
 			$ret = '';
 			foreach ($default_folders as $folder) {
 				$selected = ($this->Application->GetVar('type') == $folder) ? 'selected' : '';
 				$ret .= '<option value="' . $folder . '" ' . $selected . ' />' . $folder;
 			}
 
 			return $ret;
 		}
 	}
\ No newline at end of file
Index: branches/5.3.x/core/units/custom_data/custom_data_event_handler.php
===================================================================
--- branches/5.3.x/core/units/custom_data/custom_data_event_handler.php	(revision 16518)
+++ branches/5.3.x/core/units/custom_data/custom_data_event_handler.php	(revision 16519)
@@ -1,257 +1,257 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class CustomDataEventHandler extends kDBEventHandler {
 
 		/**
 		 * [HOOK] Allows to apply custom fields functionality to specific config
 		 * When main item is created, then cdata config is cloned
 		 *
 		 * @param kEvent $event
 		 */
 		function OnDefineCustomFields($event)
 		{
 			// 1. clone custom data table
 			$this->Application->getUnitConfig('cdata')->addClones(Array (
 				$event->MasterEvent->Prefix . '-cdata' => Array (
 					'ParentPrefix' => $event->MasterEvent->Prefix,
 					'TableName' => $this->_getDataTable($event->MasterEvent),
 				)
 			));
 
 			// 2. add custom field information to main item
 			$this->createCustomFields($event->MasterEvent->Prefix);
 		}
 
 		/**
 		 * Returns custom data table name for given event
 		 *
 		 * @param kEvent $event
 		 * @return string
 		 * @access protected
 		 */
 		protected function _getDataTable(kEvent $event)
 		{
 			$config = $event->getUnitConfig();
 			$ret = $config->getCustomDataTableName();
 
 			return $ret ? $ret : $config->getTableName() . 'CustomData';
 		}
 
 		/**
 		 * Returns list of custom fields for a given $prefix
 		 *
 		 * @param $prefix
 		 *
 		 * @return Array|bool
 		 * @access protected
 		 */
 		protected function scanCustomFields($prefix)
 		{
 			static $custom_fields = Array ();
 
 			if ( defined('IS_INSTALL') && IS_INSTALL && !$this->Application->TableFound('CustomFields', true) ) {
 				return false;
 			}
 
 			if ( !$prefix ) {
 				// prefix not specified
 				return false;
 			}
 
 			$item_type = $this->Application->getUnitConfig($prefix)->getItemType();
 			if ( !$item_type ) {
 				// no main config of such type
 				return false;
 			}
 
 			$no_caching = (defined('IS_INSTALL') && IS_INSTALL) || (defined('CUSTOM_FIELD_ADDED') && CUSTOM_FIELD_ADDED);
 
 			if ( !$custom_fields || $no_caching ) {
 				// query all custom fields at once -> saves 4 sqls queries
 
 				if ( $no_caching ) {
 					$all_custom_fields = $this->getCustomFields();
 				}
 				else {
 					$cache_key = 'all_custom_fields[%CfSerial%][%ModSerial%]';
 					$all_custom_fields = $this->Application->getCache($cache_key, false);
 
 					if ( $all_custom_fields === false ) {
 						$this->Conn->nextQueryCachable = true;
 						$all_custom_fields = $this->getCustomFields();
 						$this->Application->setCache($cache_key, $all_custom_fields);
 					}
 				}
 
 				foreach ($all_custom_fields as $custom_field_id => $custom_field_data) {
 					$cf_type = $custom_field_data['Type'];
 					if ( !array_key_exists($cf_type, $custom_fields) ) {
 						$custom_fields[$cf_type] = Array ();
 					}
 
 					$custom_fields[$cf_type][$custom_field_id] = $custom_field_data;
 				}
 			}
 
 			return array_key_exists($item_type, $custom_fields) ? $custom_fields[$item_type] : false;
 		}
 
 		/**
 		 * Returns sorted list of all custom fields
 		 *
 		 * @return Array
 		 */
 		function getCustomFields()
 		{
 			$sql = 'SELECT *
 					FROM '.TABLE_PREFIX.'CustomFields';
 			$ret = $this->Conn->Query($sql, 'CustomFieldId');
 
 			ksort($ret);
 
 			return $ret;
 		}
 
 		/**
 		 * Fills cloned cdata config with data from it's parent
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterConfigRead(kEvent $event)
 		{
 			parent::OnAfterConfigRead($event);
 
 			$config = $event->getUnitConfig();
 			$main_prefix = $config->getParentPrefix();
 
 			if ( !$main_prefix ) {
 				return;
 			}
 
 			$custom_fields = $this->scanCustomFields($main_prefix);
 
 			if ( !$custom_fields ) {
 				return;
 			}
 
 			// 2. create fields (for custom data item)
 			$field_options = Array (
 				'type' => 'string',
 				'formatter' => 'kMultiLanguage', 'db_type' => 'text',
 				'default' => ''
 			);
 
 			foreach ($custom_fields as $custom_id => $custom_params) {
 				$field_name = 'cust_' . $custom_id;
 
 				if ( $config->getFieldByName($field_name) ) {
 					continue;
 				}
 
 				$field_options['force_primary'] = !$custom_params['MultiLingual'];
 				$config->addFields($field_options, $field_name);
 			}
 		}
 
 		/**
 		 * Creates "cust_<custom_name>" virtual fields for main item
 		 *
 		 * @param string $prefix
 		 * @return void
 		 * @access protected
 		 */
 		protected function createCustomFields($prefix)
 		{
 			$custom_fields = $this->scanCustomFields($prefix);
 			if ( !$custom_fields ) {
 				return;
 			}
 
 			$calculated_fields = Array ();
 			$config = $this->Application->getUnitConfig($prefix);
 
+			/** @var InpCustomFieldsHelper $cf_helper */
 			$cf_helper = $this->Application->recallObject('InpCustomFieldsHelper');
-			/* @var $cf_helper InpCustomFieldsHelper */
 
 			$is_install = defined('IS_INSTALL') && IS_INSTALL;
 
 			foreach ($custom_fields as $custom_id => $custom_params) {
 				$custom_name = $custom_params['FieldName'];
 				$field_options = Array ('type' => 'string', 'default' => $custom_params['DefaultValue']);
 
 				// raises warnings during 4.3.9 -> 5.0.0 upgrade, no fatal sqls though
 				if ( $custom_params['IsRequired'] ) {
 					$field_options['required'] = 1;
 				}
 
 				$calculated_fields['cust_' . $custom_name] = 'cust.l' . $this->Application->GetDefaultLanguageId() . '_cust_' . $custom_id;
 
 				switch ( $custom_params['ElementType'] ) {
 					case 'date':
 						unset($field_options['options']);
 						$field_options['formatter'] = 'kDateFormatter';
 						$field_options['input_time_format'] = '';
 						$field_options['time_format'] = '';
 						break;
 
 					case 'datetime':
 						unset($field_options['options']);
 						$field_options['formatter'] = 'kDateFormatter';
 						break;
 
 					case 'select':
 					case 'multiselect':
 					case 'radio':
 						if ( $custom_params['ValueList'] ) {
 							// $is_install check prevents 335 bad phrase sql errors on upgrade to 5.1.0
 							$field_options['options'] = $is_install ? Array () : $cf_helper->GetValuesHash($custom_params['ValueList']);
 							$field_options['formatter'] = 'kOptionsFormatter';
 							$field_options['multiple'] = $custom_params['ElementType'] == 'multiselect';
 						}
 						break;
 
 					default:
 						if ( $custom_params['MultiLingual'] ) {
 							$field_options['formatter'] = 'kMultiLanguage';
 							$calculated_fields['cust_' . $custom_name] = 'cust.l%2$s_cust_' . $custom_id;
 						}
 						break;
 				}
 
 				$field_name = 'cust_' . $custom_name;
 				$old_field_options = $config->getVirtualFieldByName($field_name, Array ());
 
 				$config->addVirtualFields(Array (
 					$field_name => kUtil::array_merge_recursive($field_options, $old_field_options)
 				));
 
 				$custom_fields[$custom_id] = $custom_name;
 			}
 
 			foreach ($config->getCalculatedFieldSpecials() as $special) {
 				if ( $special == '-virtual' ) {
 					continue;
 				}
 
 				$config->addCalculatedFieldsBySpecial($special, $calculated_fields);
 			}
 
 			$config->setCustomFields($custom_fields);
 		}
 	}
\ No newline at end of file
Index: branches/5.3.x/core/units/logs/session_logs/session_log_eh.php
===================================================================
--- branches/5.3.x/core/units/logs/session_logs/session_log_eh.php	(revision 16518)
+++ branches/5.3.x/core/units/logs/session_logs/session_log_eh.php	(revision 16519)
@@ -1,200 +1,200 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class SessionLogEventHandler extends kDBEventHandler {
 
 		/**
 		 * Opens log for new session
 		 *
 		 * @param kEvent $event
 		 */
 		function OnStartSession($event)
 		{
 			if (!$this->Application->ConfigValue('UseChangeLog')) {
 				// don't use session log when change log is disabled
 				return ;
 			}
 
+			/** @var kDBItem $object */
 			$object = $this->Application->recallObject($event->Prefix, null, Array ('skip_autoload' => 1));
-			/* @var $object kDBItem */
 
 			$fields_hash = Array (
 				'SessionStart' => time(),
 				'IP' => $this->Application->getClientIp(),
 				'PortalUserId' => $this->Application->RecallVar('user_id'),
 				'SessionId' => $this->Application->GetSID(),
 				'Status' => SESSION_LOG_ACTIVE,
 			);
 
 			$object->SetDBFieldsFromHash($fields_hash);
 
 			$object->UpdateFormattersSubFields();
 
 			if ($object->Create()) {
 				$this->Application->StoreVar('_SessionLogId_', $object->GetID());
 			}
 		}
 
 		/**
 		 * Closes log for current session
 		 *
 		 * @param kEvent $event
 		 */
 		function OnEndSession($event)
 		{
+			/** @var kDBItem $object */
 			$object = $this->Application->recallObject($event->Prefix, null, Array ('skip_autoload' => 1));
-			/* @var $object kDBItem */
 
 			$object->Load($this->Application->RecallVar('_SessionLogId_'));
 			if (!$object->isLoaded()) {
 				return ;
 			}
 
 			$fields_hash = Array (
 				'SessionEnd' => time(),
 				'Status' => SESSION_LOG_LOGGED_OUT,
 			);
 
 			$object->SetDBFieldsFromHash($fields_hash);
 
 			$object->UpdateFormattersSubFields();
 			$object->Update();
 		}
 
 		/**
 		 * Apply custom processing to item
 		 *
 		 * @param kEvent $event
 		 * @param string $type
 		 * @return void
 		 * @access protected
 		 */
 		protected function customProcessing(kEvent $event, $type)
 		{
 			if ( $event->Name == 'OnMassDelete' && $type == 'before' ) {
 				$ids = $event->getEventParam('ids');
 				if ( $ids ) {
 					$config = $event->getUnitConfig();
 					$id_field = $config->getIDField();
 
 					$sql = 'SELECT ' . $id_field . '
 							FROM ' . $config->getTableName() . '
 							WHERE ' . $id_field . ' IN (' . implode(',', $ids) . ') AND Status <> ' . SESSION_LOG_ACTIVE;
 					$allowed_ids = $this->Conn->GetCol($sql);
 
 					$event->setEventParam('ids', $allowed_ids);
 				}
 			}
 		}
 
 		/**
 		 * Delete changes, related to deleted session
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemDelete(kEvent $event)
 		{
 			parent::OnAfterItemDelete($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$change_logs_config = $this->Application->getUnitConfig('change-log');
 
 			$sql = 'SELECT ' . $change_logs_config->getIDField() . '
 					FROM ' . $change_logs_config->getTableName() . '
 					WHERE SessionLogId = ' . $object->GetID();
 			$related_ids = $this->Conn->GetCol($sql);
 
 			if ( $related_ids ) {
+				/** @var kTempTablesHandler $temp_handler */
 				$temp_handler = $this->Application->recallObject('change-log_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event->MasterEvent));
-				/* @var $temp_handler kTempTablesHandler */
 
 				$temp_handler->DeleteItems('change-log', '', $related_ids);
 			}
 		}
 
 		/**
 		 * [SCHEDULED TASK] Will remove old session logs
 		 *
 		 * @param kEvent $event Event.
 		 *
 		 * @return void
 		 */
 		protected function OnRotate(kEvent $event)
 		{
 			$rotation_interval = (int)$this->Application->ConfigValue('SessionLogRotationInterval');
 
 			if ( $rotation_interval === -1 ) {
 				// Forever.
 				return;
 			}
 
 			$session_log_temp_handler = $this->getTempTablesHandler($event->getPrefixSpecial(), $event);
 			$change_log_temp_handler = $this->getTempTablesHandler('change-log', $event);
 
 			$limit = 100;
 			$session_log_config = $event->getUnitConfig();
 			$session_log_select_sql = '	SELECT ' . $session_log_config->getIDField() . '
 										FROM ' . $session_log_config->getTableName() . '
 										WHERE ' . TIMENOW . ' - SessionEnd > ' . $rotation_interval . '
 										LIMIT 0,' . $limit;
 			$change_log_config = $this->Application->getUnitConfig('change-log');
 
 			do {
 				$session_log_ids = $this->Conn->GetCol($session_log_select_sql);
 
 				if ( !$session_log_ids ) {
 					break;
 				}
 
 				$change_log_select_sql = '	SELECT ' . $change_log_config->getIDField() . '
 											FROM ' . $change_log_config->getTableName() . '
 											WHERE SessionLogId IN (' . implode(',', $session_log_ids) . ')
 											LIMIT 0,' . $limit;
 
 				do {
 					$change_log_ids = $this->Conn->GetCol($change_log_select_sql);
 
 					if ( $change_log_ids ) {
 						$change_log_temp_handler->DeleteItems('change-log', '', $change_log_ids);
 					}
 				} while ( count($change_log_ids) == $limit );
 
 				$session_log_temp_handler->DeleteItems($event->Prefix, $event->Special, $session_log_ids);
 			} while ( count($session_log_ids) == $limit );
 		}
 
 		/**
 		 * Get temp tables handler instance.
 		 *
 		 * @param string $prefix_special Prefix, special.
 		 * @param kEvent $event          Event.
 		 *
 		 * @return kTempTablesHandler
 		 */
 		public function getTempTablesHandler($prefix_special, kEvent $event)
 		{
 			return $this->Application->recallObject(
 				$prefix_special . '_TempHandler',
 				'kTempTablesHandler',
 				array('parent_event' => $event)
 			);
 		}
 
 	}
Index: branches/5.3.x/core/units/logs/system_logs/system_log_eh.php
===================================================================
--- branches/5.3.x/core/units/logs/system_logs/system_log_eh.php	(revision 16518)
+++ branches/5.3.x/core/units/logs/system_logs/system_log_eh.php	(revision 16519)
@@ -1,122 +1,122 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2012 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class SystemLogEventHandler extends kDBEventHandler {
 
 	/**
 	 * Filters messages, that require e-mail notification to be sent
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function SetCustomQuery(kEvent $event)
 	{
 		parent::SetCustomQuery($event);
 
+		/** @var kDBList $object */
 		$object = $event->getObject();
-		/* @var $object kDBList */
 
 		if ( $event->Special == 'email' ) {
 			$unique_id = $event->getEventParam('unique_id');
 
 			if ( $unique_id !== false ) {
 				$object->addFilter('notification_filter', '%1$s.LogNotificationStatus = ' . kLogger::LNS_SENT);
 				$object->addFilter('unique_filter', '%1$s.LogUniqueId = ' . $unique_id);
 			}
 			else {
 				$object->addFilter('notification_filter', '%1$s.LogNotificationStatus = ' . kLogger::LNS_PENDING);
 			}
 		}
 	}
 
 	/**
 	 * [SCHEDULED TASK] Sends delayed notification of system log messages
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnSendNotifications(kEvent $event)
 	{
 		// initialize list outside of e-mail event with right settings
+		/** @var kDBList $list */
 		$list = $this->Application->recallObject($event->Prefix . '.email', $event->Prefix . '_List', Array ('per_page' => 20));
-		/* @var $list kDBList */
 
 		if ( !$list->GetRecordsCount() ) {
 			// no messages, that needs to be sent
 			return;
 		}
 
 		$notification_email = $this->Application->ConfigValue('SystemLogNotificationEmail');
 
 		if ( !$notification_email ) {
 			$this->Application->removeObject($event->Prefix . '.email');
 			trigger_error('System Log notification E-mail not specified', E_USER_NOTICE);
 
 			return;
 		}
 
 		$send_params = Array (
 			'to_name' => $notification_email,
 			'to_email' => $notification_email,
 		);
 
 		$this->Application->emailAdmin('SYSTEM.LOG.NOTIFY', null, $send_params);
 		$this->Application->removeObject($event->Prefix . '.email');
 
+		/** @var kDBItem $object */
 		$object = $event->getObject(Array ('skip_autoload' => true));
-		/* @var $object kDBItem */
 
 		foreach ($list as $fields_hash) {
 			$object->LoadFromHash($fields_hash);
 			$object->SetDBField('LogNotificationStatus', kLogger::LNS_SENT);
 			$object->Update();
 		}
 	}
 
 	/**
 	 * [SCHEDULED TASK] Will remove old system logs
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnRotate(kEvent $event)
 	{
 		$rotation_interval = (int)$this->Application->ConfigValue('SystemLogRotationInterval');
 
 		if ( $rotation_interval === -1 ) {
 			// forever
 			return;
 		}
 
 		$config = $event->getUnitConfig();
 
 		$sql = 'SELECT ' . $config->getIDField() . '
 				FROM ' . $config->getTableName() . '
 				WHERE ' . TIMENOW . ' - LogTimestamp > ' . $rotation_interval . '
 				LIMIT 0,50';
 		$ids = $this->Conn->GetCol($sql);
 
 		if ( $ids ) {
+			/** @var kTempTablesHandler $temp_handler */
 			$temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
-			/* @var $temp_handler kTempTablesHandler */
 
 			$temp_handler->DeleteItems($event->Prefix, $event->Special, $ids);
 		}
 	}
 }
Index: branches/5.3.x/core/units/logs/system_logs/system_log_tp.php
===================================================================
--- branches/5.3.x/core/units/logs/system_logs/system_log_tp.php	(revision 16518)
+++ branches/5.3.x/core/units/logs/system_logs/system_log_tp.php	(revision 16519)
@@ -1,175 +1,175 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2012 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class SystemLogTagProcessor extends kDBTagProcessor {
 
 	/**
 	 * Displays filename
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function Filename($params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		$filename = $object->GetDBField('LogSourceFilename');
 
 		if ( !$filename ) {
 			return '';
 		}
 
 		return preg_replace('/^' . preg_quote(FULL_PATH, '/') . '/', '...', $filename, 1);
 	}
 
 	/**
 	 * Displays filename
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function RequestURI($params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		$request_uri = $object->GetDBField('LogRequestURI');
 
 		if ( !$request_uri ) {
 			return '';
 		}
 
 		return preg_replace('/^' . preg_quote(BASE_PATH, '/') . '/', '...', $request_uri, 1);
 	}
 
 	/**
 	 * Displays used memory
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function MemoryUsage($params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		return kUtil::formatSize($object->GetDBField('LogMemoryUsed'));
 	}
 
 	/**
 	 * Prints serialized array
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function PrintArray($params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		$field = $params['field'];
 		$value = $object->GetDBField($field);
 
 		if ( !$value ) {
 			return '';
 		}
 
 		$value = print_r(unserialize($value), true);
 
 		return $this->highlightString($value);
 	}
 
 	/**
 	 * Prints backtrace result
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function PrintBacktrace($params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		$value = $object->GetDBField('LogBacktrace');
 
 		if ( !$value ) {
 			return '';
 		}
 
 		$ret = '';
 		$trace = unserialize($value);
 		$include_args = isset($params['include_args']) ? $params['include_args'] : false;
 		$strip_tags = isset($params['strip_tags']) ? $params['strip_tags'] : false;
 
 		$block_params = $this->prepareTagParams($params);
 		$block_params['name'] = $params['render_as'];
 
 		foreach ($trace as $index => $trace_info) {
 			$block_params['index'] = $index;
 
 			if ( isset($trace_info['file']) ) {
 				$function_name = isset($trace_info['class']) ? $trace_info['class'] . $trace_info['type'] . $trace_info['function'] : $trace_info['function'];
 				$block_params['file_info'] = $function_name . ' in <b>' . basename($trace_info['file']) . '</b> on line <b>' . $trace_info['line'] . '</b>';
 
 				if ( $strip_tags ) {
 					$block_params['file_info'] = strip_tags($block_params['file_info']);
 				}
 			}
 			else {
 				$block_params['file_info'] = 'no file information available';
 			}
 
 			$block_params['has_args'] = isset($trace_info['args']);
 
 			if ( $include_args ) {
 				$block_params['args'] = $block_params['has_args'] ? $this->highlightString(print_r($trace_info['args'], true)) : '';
 			}
 
 			$ret .= $this->Application->ParseBlock($block_params);
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Prints backtrace record index
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function BacktraceIndex($params)
 	{
 		$index = $this->Application->Parser->GetParam('index') + 1;
 
 		return str_pad($index, 3, ' ', STR_PAD_LEFT);
 	}
 
 	public function highlightString($string)
 	{
 		$string = str_replace(Array ('\\', '/'), Array ('_nms1_', '_nms2_'), $string);
 		$string = highlight_string('<?php ' . $string . ' ?>', true);
 		$string = str_replace(Array ('_nms1_', '_nms2_'), Array ('\\', '/'), $string);
 
 		return str_replace(Array ('&lt;?php&nbsp;', '?&gt;'), '', $string);
 	}
 }
Index: branches/5.3.x/core/units/logs/change_logs/change_log_eh.php
===================================================================
--- branches/5.3.x/core/units/logs/change_logs/change_log_eh.php	(revision 16518)
+++ branches/5.3.x/core/units/logs/change_logs/change_log_eh.php	(revision 16519)
@@ -1,66 +1,66 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class ChangeLogEventHandler extends kDBEventHandler {
 
 	/**
 	 * Allows to override standard permission mapping
 	 *
 	 * @return void
 	 * @access protected
 	 * @see kEventHandler::$permMapping
 	 */
 	protected function mapPermissions()
 	{
 		parent::mapPermissions();
 
 		$permissions = Array (
 			'OnEnableLog' => Array ('self' => 'view'),
 		);
 
 		$this->permMapping = array_merge($this->permMapping, $permissions);
 	}
 
 	/**
 	 * Updates affected record count in session, when change log record is deleted
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnAfterItemDelete(kEvent $event)
 	{
 		parent::OnAfterItemDelete($event);
 
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		$sql = 'UPDATE ' . $this->Application->getUnitConfig('session-log')->getTableName() . '
 				SET AffectedItems = AffectedItems - 1
 				WHERE SessionLogId = ' . $object->GetDBField('SessionLogId');
 		$this->Conn->Query($sql);
 	}
 
 	/**
 	 * Changes configuration value to enable log writing
 	 *
 	 * @param kEvent $event
 	 */
 	function OnEnableLog($event)
 	{
 		$this->Application->SetConfigValue('UseChangeLog', 1);
 	}
 }
\ No newline at end of file
Index: branches/5.3.x/core/units/logs/email_logs/email_log_tp.php
===================================================================
--- branches/5.3.x/core/units/logs/email_logs/email_log_tp.php	(revision 16518)
+++ branches/5.3.x/core/units/logs/email_logs/email_log_tp.php	(revision 16519)
@@ -1,131 +1,131 @@
 <?php
 /**
  * @version	$Id$
  * @package	In-Portal
  * @copyright	Copyright (C) 1997 - 2012 Intechnic. All rights reserved.
  * @license	  GNU/GPL
  * In-Portal is Open Source software.
  * This means that this software may have been modified pursuant
  * the GNU General Public License, and as distributed it includes
  * or is derivative of works licensed under the GNU General Public License
  * or other free or open source software licenses.
  * See http://www.in-portal.org/license for copyright notices and details.
  */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class EmailLogTagProcessor extends kDBTagProcessor {
 
 	/**
 	 * Prints other e-mail recipients
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function PrintOtherRecipients($params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		$other_recipients = $object->GetDBField('OtherRecipients');
 		$other_recipients = $other_recipients ? unserialize($other_recipients) : Array ();
 
 		$ret = '';
 		$block_params = $this->prepareTagParams($params);
 		$block_params['name'] = $params['render_as'];
 
 		foreach ($other_recipients as $recipient_type => $recipients) {
 			if ( $recipient_type == EmailTemplate::RECIPIENT_TYPE_TO ) {
 				array_shift($recipients);
 			}
 
 			if ( $recipients ) {
 				$block_params['recipient_type'] = $recipient_type;
 				$block_params['recipients'] = $recipients;
 
 				$ret .= $this->Application->ParseBlock($block_params);
 			}
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Returns recipient type
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function RecipientType($params)
 	{
 		$heading_mapping = Array (
 			EmailTemplate::RECIPIENT_TYPE_TO => 'To',
 			EmailTemplate::RECIPIENT_TYPE_CC => 'Cc',
 			EmailTemplate::RECIPIENT_TYPE_BCC => 'Bcc',
 		);
 
 		$recipient_type = $this->Application->Parser->GetParam('recipient_type');
 
 		return $heading_mapping[$recipient_type];
 	}
 
 	/**
 	 * Prints recipients
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function RecipientsByType($params)
 	{
+		/** @var Array $recipients */
 		$recipients = $this->Application->Parser->GetParam('recipients');
-		/* @var $recipients Array */
 
 		$ret = '';
 		$block_params = $this->prepareTagParams($params);
 		$block_params['name'] = $params['render_as'];
 
 		$recipient_count = count($recipients);
 
 		foreach ($recipients as $index => $recipient) {
 			$block_params['recipient_name'] = $recipient['name'] ? $recipient['name'] : $recipient['email'];
 			$block_params['recipient_email'] = $recipient['email'];
 			$block_params['is_last'] = $index == $recipient_count - 1;
 
 			$ret .= $this->Application->ParseBlock($block_params);
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Creates link to an item including only it's id
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function ItemLink($params)
 	{
 		$access_key = $this->Application->Parser->GetParam('email_access_key');
 
 		if ( !$access_key ) {
 			return parent::ItemLink($params);
 		}
 
 		$params['authkey'] = $access_key;
 
 		if ( $this->Application->isAdmin ) {
 //			$params['index_file'] = 'index.php';
 			$params['prefix'] = '_FRONT_END_';
 
 			if ( $this->Application->ConfigValue('UseModRewrite') ) {
 				$params['__MOD_REWRITE__'] = 1;
 			}
 		}
 
 		return $this->Application->ProcessParsedTag('m', 't', $params);
 	}
 }
\ No newline at end of file
Index: branches/5.3.x/core/units/logs/email_logs/email_log_eh.php
===================================================================
--- branches/5.3.x/core/units/logs/email_logs/email_log_eh.php	(revision 16518)
+++ branches/5.3.x/core/units/logs/email_logs/email_log_eh.php	(revision 16519)
@@ -1,128 +1,128 @@
 <?php
 /**
  * @version	$Id$
  * @package	In-Portal
  * @copyright	Copyright (C) 1997 - 2012 Intechnic. All rights reserved.
  * @license	  GNU/GPL
  * In-Portal is Open Source software.
  * This means that this software may have been modified pursuant
  * the GNU General Public License, and as distributed it includes
  * or is derivative of works licensed under the GNU General Public License
  * or other free or open source software licenses.
  * See http://www.in-portal.org/license for copyright notices and details.
  */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class EmailLogEventHandler extends kDBEventHandler {
 
 	/**
 	 * Allows to override standard permission mapping
 	 *
 	 * @return void
 	 * @access protected
 	 * @see kEventHandler::$permMapping
 	 */
 	protected function mapPermissions()
 	{
 		parent::mapPermissions();
 
 		$permissions = Array (
 			'OnItemBuild' => Array ('self' => true),
 			'OnGetHtmlBody' => Array ('self' => 'edit'),
 		);
 
 		$this->permMapping = array_merge($this->permMapping, $permissions);
 	}
 
 	/**
 	 * Returns ID of current item to be edited
 	 * by checking ID passed in get/post as prefix_id
 	 * or by looking at first from selected ids, stored.
 	 * Returned id is also stored in Session in case
 	 * it was explicitly passed as get/post
 	 *
 	 * @param kEvent $event
 	 * @return int
 	 * @access public
 	 */
 	public function getPassedID(kEvent $event)
 	{
 		if ( $this->Application->isAdmin ) {
 			return parent::getPassedID($event);
 		}
 
 		$authkey = $this->Application->GetVar('authkey');
 
 		return $authkey ? Array ('AccessKey' => $authkey) : false;
 	}
 
 	/**
 	 * [SCHEDULED TASK] Will remove old e-mail logs
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnRotate(kEvent $event)
 	{
 		$rotation_interval = (int)$this->Application->ConfigValue('EmailLogRotationInterval');
 
 		if ( $rotation_interval === -1 ) {
 			// forever
 			return;
 		}
 
 		$config = $event->getUnitConfig();
 
 		$sql = 'SELECT ' . $config->getIDField() . '
 				FROM ' . $config->getTableName() . '
 				WHERE ' . TIMENOW . ' - SentOn > ' . $rotation_interval;
 		$ids = $this->Conn->GetCol($sql);
 
 		if ( $ids ) {
+			/** @var kTempTablesHandler $temp_handler */
 			$temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
-			/* @var $temp_handler kTempTablesHandler */
 
 			$temp_handler->DeleteItems($event->Prefix, $event->Special, $ids);
 		}
 	}
 
 	/**
 	 * Returns HTML of sent e-mail for iframe
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnGetHtmlBody(kEvent $event)
 	{
 		$event->status = kEvent::erSTOP;
 
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		echo '<html><body style="font-size: 14px;">' . $object->GetDBField('HtmlBody') . '</body></html>';
 	}
 
 	/**
 	 * Checks, that currently loaded item is allowed for viewing (non permission-based)
 	 *
 	 * @param kEvent $event
 	 * @return bool
 	 * @access protected
 	 */
 	protected function checkItemStatus(kEvent $event)
 	{
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		if ( !$object->isLoaded() ) {
 			return true;
 		}
 
 		$access_key = $object->GetDBField('AccessKey');
 
 		return $access_key && $this->Application->GetVar('authkey') == $access_key;
 	}
 }
\ No newline at end of file
Index: branches/5.3.x/core/units/scheduled_tasks/scheduled_task_eh.php
===================================================================
--- branches/5.3.x/core/units/scheduled_tasks/scheduled_task_eh.php	(revision 16518)
+++ branches/5.3.x/core/units/scheduled_tasks/scheduled_task_eh.php	(revision 16519)
@@ -1,279 +1,279 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class ScheduledTaskEventHandler extends kDBEventHandler {
 
 		/**
 		 * Allows to override standard permission mapping
 		 *
 		 * @return void
 		 * @access protected
 		 * @see kEventHandler::$permMapping
 		 */
 		protected function mapPermissions()
 		{
 			parent::mapPermissions();
 
 			$permissions = Array (
 				'OnMassCancel' => Array ('self' => 'add|edit'),
 			);
 
 			$this->permMapping = array_merge($this->permMapping, $permissions);
 		}
 
 		/**
 		 * Does custom validation
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemValidate(kEvent $event)
 		{
 			parent::OnBeforeItemValidate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$event_string = $object->GetDBField('Event');
 
 			if ( !$event_string ) {
 				return;
 			}
 
 			try {
 				$this->Application->eventImplemented(new kEvent($event_string));
 			}
 			catch (Exception $e) {
 				$object->SetError('Event', 'invalid_event', '+' . $e->getMessage());
 			}
 		}
 
 		/**
 		 * [HOOK] Refreshes scheduled task list in database based on cached data from unit configs
 		 *
 		 * @param kEvent $event
 		 */
 		function OnRefresh($event)
 		{
 			$scheduled_tasks_from_cache = $this->Application->EventManager->getScheduledTasks(true);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject( Array ('skip_autoload' => true) );
-			/* @var $object kDBItem */
 
 			$processed_ids = Array ();
 			$scheduled_tasks_from_db = $this->Conn->Query($object->GetSelectSQL(), 'Name');
 
+			/** @var kCronHelper $cron_helper */
 			$cron_helper = $this->Application->recallObject('kCronHelper');
-			/* @var $cron_helper kCronHelper */
 
 			foreach ($scheduled_tasks_from_cache as $scheduled_task_name => $scheduled_task_params) {
 				if ( !isset($scheduled_tasks_from_db[$scheduled_task_name]) ) {
 					$fields_hash = Array (
 						'Event' => $scheduled_task_params['Event'],
 						'Name' => $scheduled_task_name,
 						'Type' => ScheduledTask::TYPE_SYSTEM,
 						'Module' => $scheduled_task_params['Module'],
 						'Status' => isset($scheduled_task_params['Status']) ? $scheduled_task_params['Status'] : STATUS_ACTIVE,
 						'RunSchedule' => $scheduled_task_params['RunSchedule'],
 					);
 
 					$object->Clear();
 					$object->SetDBFieldsFromHash($fields_hash);
 					$cron_helper->load($object, 'RunSchedule');
 					$object->Create();
 				}
 				else {
 					$object->LoadFromHash( $scheduled_tasks_from_db[$scheduled_task_name] );
 				}
 
 				$processed_ids[] = $object->GetID();
 			}
 
 			// delete all non-processed scheduled tasks (ones, that were deleted from unit configs)
 			$sql = 'SELECT ' . $object->IDField . '
 					FROM ' . $object->TableName . '
 					WHERE (Type = ' . ScheduledTask::TYPE_SYSTEM . ') AND (' . $object->IDField . ' NOT IN (' . implode(',', $processed_ids) . '))';
 			$delete_ids = $this->Conn->GetCol($sql);
 
 			if ($delete_ids) {
+				/** @var kTempTablesHandler $temp_handler */
 				$temp_handler = $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
-				/* @var $temp_handler kTempTablesHandler */
 
 				$temp_handler->DeleteItems($event->Prefix, $event->Special, $delete_ids);
 			}
 
 			$this->Application->removeObject($event->getPrefixSpecial());
 		}
 
 		/**
 		 * Don't allow to delete other user's messages
 		 *
 		 * @param kEvent $event
 		 * @param string $type
 		 * @return void
 		 * @access protected
 		 */
 		protected function customProcessing(kEvent $event, $type)
 		{
 			if ( $event->Name == 'OnMassDelete' && $type == 'before' ) {
 				if ( $this->Application->isDebugMode() ) {
 					// allow to delete system scheduled tasks in debug mode
 					return;
 				}
 
 				$ids = $event->getEventParam('ids');
 
 				if ( $ids ) {
 					$config = $event->getUnitConfig();
 					$id_field = $config->getIDField();
 
 					$sql = 'SELECT ' . $id_field . '
 							FROM ' . $config->getTableName() . '
 							WHERE ' . $id_field . ' IN (' . implode(',', $ids) . ') AND Type <> ' . ScheduledTask::TYPE_SYSTEM;
 					$event->setEventParam('ids', $this->Conn->GetCol($sql));
 				}
 			}
 		}
 
 		/**
 		 * Cancels scheduled tasks, that are currently running
 		 *
 		 * @param kEvent $event
 		 */
 		function OnMassCancel($event)
 		{
 			$ids = $this->StoreSelectedIDs($event);
 
 			if ($ids) {
+				/** @var kDBItem $object */
 				$object = $event->getObject( Array ('skip_autoload' => true) );
-				/* @var $object kDBItem */
 
 				foreach ($ids as $id) {
 					$object->Load($id);
 
 					if ($object->GetDBField('LastRunStatus') == ScheduledTask::LAST_RUN_RUNNING) {
 						// only changes status, doesn't affect currency running scheduled tasks
 						$object->SetDBField('LastRunStatus', ScheduledTask::LAST_RUN_FAILED);
 						$object->Update();
 					}
 				}
 			}
 
 			$this->clearSelectedIDs($event);
 		}
 
 		/**
 		 * Loads schedule from database to virtual fields
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemLoad(kEvent $event)
 		{
 			parent::OnAfterItemLoad($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
+			/** @var kCronHelper $cron_helper */
 			$cron_helper = $this->Application->recallObject('kCronHelper');
-			/* @var $cron_helper kCronHelper */
 
 			$cron_helper->load($object, 'RunSchedule');
 		}
 
 		/**
 		 * Validates schedule
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemCreate(kEvent $event)
 		{
 			parent::OnBeforeItemCreate($event);
 
 			$this->_itemChanged($event);
 		}
 
 		/**
 		 * Validates schedule
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemUpdate(kEvent $event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
 			$this->_itemChanged($event);
 		}
 
 		/**
 		 * Validates schedule
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function _itemChanged(kEvent $event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
+			/** @var kCronHelper $cron_helper */
 			$cron_helper = $this->Application->recallObject('kCronHelper');
-			/* @var $cron_helper kCronHelper */
 
 			if ( $cron_helper->validateAndSave($object, 'RunSchedule') && !$object->GetDBField('NextRunOn_date') ) {
 				$next_run = $cron_helper->getMatch($object->GetDBField('RunSchedule'));
 				$object->SetDBField('NextRunOn_date', $next_run);
 				$object->SetDBField('NextRunOn_time', $next_run);
 			}
 		}
 
 		/**
 		 * Creates schedule fields
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterConfigRead(kEvent $event)
 		{
 			parent::OnAfterConfigRead($event);
 
 			// Don't initialize 'scheduled-task' unit, because scheduled tasks are not run during install.
 			if ( defined('IS_INSTALL') && IS_INSTALL ) {
 				return;
 			}
 
 			if ( $this->Application->findModule('Name', 'Custom') ) {
 				$config = $event->getUnitConfig();
 
 				$fields = $config->getFields();
 				$fields['Module']['default'] = 'Custom';
 				$config->setFields($fields);
 			}
 
+			/** @var kCronHelper $cron_helper */
 			$cron_helper = $this->Application->recallObject('kCronHelper');
-			/* @var $cron_helper kCronHelper */
 
 			$cron_helper->initUnit($event->Prefix, 'RunSchedule');
 
 		}
 	}
Index: branches/5.3.x/core/units/promo_block_groups/promo_block_group_eh.php
===================================================================
--- branches/5.3.x/core/units/promo_block_groups/promo_block_group_eh.php	(revision 16518)
+++ branches/5.3.x/core/units/promo_block_groups/promo_block_group_eh.php	(revision 16519)
@@ -1,134 +1,134 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class PromoBlockGroupEventHandler extends kDBEventHandler {
 
 	/**
 	 * Occurs before creating item
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnBeforeItemCreate(kEvent $event)
 	{
 		parent::OnBeforeItemCreate($event);
 		$this->beforeItemChange($event);
 	}
 
 	/**
 	 * Occurs before updating item
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnBeforeItemUpdate(kEvent $event)
 	{
 		parent::OnBeforeItemUpdate($event);
 		$this->beforeItemChange($event);
 	}
 
 	/**
 	 * Occurs before updating item
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access private
 	 */
 	private function beforeItemChange($event)
 	{
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		$object->setRequired('TransitionEffectCustom', $object->GetDBField('TransitionEffect') == '-1');
 	}
 
 	/**
 	 * Occurs before deleting item, id of item being
 	 * deleted is stored as 'id' event param
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnBeforeItemDelete(kEvent $event)
 	{
 		parent::OnBeforeItemDelete($event);
 
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		$sql = 'SELECT BlockId
 				FROM ' . TABLE_PREFIX . 'PromoBlocks
 				WHERE PromoBlockGroupId = ' . $object->GetID();
 		$block_id = $this->Conn->GetOne($sql);
 
 		if ( $block_id ) {
 			$event->MasterEvent->SetRedirectParam('grid_error', 'la_error_PromoGroupNotEmpty');
 			$event->status = kEvent::erFAIL;
 		}
 	}
 
 	/**
 	 * Deleting empty promo block group disconnects it from associated sections
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnAfterItemDelete(kEvent $event)
 	{
 		parent::OnAfterItemDelete($event);
 
 		$sql = 'UPDATE ' . TABLE_PREFIX . 'Categories
 				SET PromoBlockGroupId = 0
 				WHERE PromoBlockGroupId = ' . $event->getEventParam('id');
 		$this->Conn->Query($sql);
 	}
 
 	/**
 	 * Set tree update flag
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnSave(kEvent $event)
 	{
 		parent::OnSave($event);
 
 		if ( $event->status == kEvent::erSUCCESS ) {
 			$event->SetRedirectParam('refresh_tree', 1);
 		}
 	}
 
 	/**
 	 * Set tree update flag
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnMassDelete(kEvent $event)
 	{
 		parent::OnMassDelete($event);
 
 		if ( $event->status == kEvent::erSUCCESS ) {
 			$event->SetRedirectParam('refresh_tree', 1);
 		}
 	}
 }
Index: branches/5.3.x/core/units/promo_block_groups/promo_block_group_tp.php
===================================================================
--- branches/5.3.x/core/units/promo_block_groups/promo_block_group_tp.php	(revision 16518)
+++ branches/5.3.x/core/units/promo_block_groups/promo_block_group_tp.php	(revision 16519)
@@ -1,73 +1,73 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class PromoBlockGroupTagProcessor extends kDBTagProcessor {
 
 	/**
 	 * Print list of categories
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function PrintCategories(Array $params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		$ret = '';
 		$field = $this->SelectParam($params, 'name,field');
 		$categories = explode(';', $object->GetDBField($field));
 
 		$block_params = $this->prepareTagParams($params);
 		$block_params['name'] = $params['render_as'];
 
 		foreach ($categories as $category_id) {
 			if ( $category_id ) {
 				$block_params['cat_id'] = $category_id;
 				$ret .= $this->Application->ParseBlock($block_params);
 			}
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Returns link to edit promo block group, associated with this promo block list
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @return protected
 	 */
 	protected function EditLink(Array $params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		$prefix = $object->getPrefixSpecial();
 
 		$url_params = Array (
 			'm_opener' => 'd',
 			$prefix . '_mode' => 't',
 			$prefix . '_event' => 'OnEdit',
 			$prefix . '_id' => $object->GetID(),
 			'pass' => 'all,' . $prefix,
 			'no_pass_through' => 1,
 		);
 
 		return $this->Application->HREF($params['edit_template'], '', $url_params);
 	}
 }
Index: branches/5.3.x/core/units/images/image_tag_processor.php
===================================================================
--- branches/5.3.x/core/units/images/image_tag_processor.php	(revision 16518)
+++ branches/5.3.x/core/units/images/image_tag_processor.php	(revision 16519)
@@ -1,508 +1,508 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class ImageTagProcessor extends kDBTagProcessor {
 
 	/**
 	 * Prepares all image parameters as list block parameters (for easy usage)
 	 *
 	 * @param kDBList $object
 	 * @param Array $block_params
 	 * @return void
 	 * @access protected
 	 * @author Alex
 	 */
 	protected function PrepareListElementParams(&$object, &$block_params)
 	{
 		$image_url = $this->ImageSrc($block_params);
 		if ( !$image_url ) {
 			return ;
 		}
 
 		$parent_prefix = $object->getUnitConfig()->getParentPrefix();
 
+		/** @var kDBItem $parent_item */
 		$parent_item = $this->Application->recallObject($parent_prefix);
-		/* @var $parent_item kDBItem */
 
 		$block_params['img_path'] = $image_url;
 		$image_dimensions = $this->ImageSize($block_params);
 		$block_params['img_size'] = $image_dimensions ? $image_dimensions : ' width="' . $block_params['DefaultWidth'] . '"';
 		$block_params['alt'] = $object->GetField('AltName') ? $object->GetField('AltName') : $this->getItemTitle($parent_item);
 		$block_params['align'] = array_key_exists('align', $block_params) ? $block_params['align'] : 'left';
 
 		// TODO: consider escaping in template instead
 		$block_params['alt'] = kUtil::escape($block_params['alt']);
 	}
 
 	/**
 	 * Returns value of object's title field
 	 *
 	 * @param kDBItem $object
 	 * @return string
 	 * @access protected
 	 */
 	protected function getItemTitle(&$object)
 	{
 		$title_field = $object->getUnitConfig()->getTitleField();
 
 		return $object->GetField($title_field);
 	}
 
 	/**
 	 * [AGGREGATED TAGS] works as <inp2:CatalogItemPrefix_Image, ImageSize, ImageSrc ..../>
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function ItemImageTag($params)
 	{
 		$this->LoadItemImage($params);
 		$tag_name = $params['original_tag'];
 
 		return $this->$tag_name($params);
 	}
 
 	function LargeImageExists($params)
 	{
 		$object = $this->getObject($params);
 		if ($object->GetDBField('SameImages') == null || $object->GetDBField('SameImages') == 1) {
 			return false;
 		}
 		else {
 			return true;
 		}
 	}
 
 	function LoadItemImage($params)
 	{
+		/** @var kCatDBItem $parent_item */
 		$parent_item = $this->Application->recallObject($params['PrefixSpecial']);
-		/* @var $parent_item kCatDBItem */
 
+		/** @var kDBItem $object */
 		$object = $this->Application->recallObject($this->getPrefixSpecial(), null, Array('skip_autoload' => true));
-		/* @var $object kDBItem */
 
 		$object->Clear();
 
 		// if we need primary thumbnail which is preloaded with category item's list
 		$is_primary = $this->SelectParam($params, 'primary,Primary');
 		$image_name = $this->SelectParam($params, 'name,Name');
 		$image_field = $this->SelectParam($params, 'field,Field'); // ie. virtual names PrimaryImage, Image1, Image2
 		$image_id = $this->Application->GetVar($this->Prefix.'_id');
 
 		if (
 			// is primary, when primary mark set OR name & field not given
 			($is_primary || !($image_name || $image_field)) &&
 
 			// primary image is preloaded AND direct id not given
 			$parent_item->isField('ThumbPath') && !$image_id
 		) {
 			if (is_null($parent_item->GetDBField('SameImages'))) {
 				// JOIN definetly failed, because it's not-null column
 				$object->setLoaded(false);
 			}
 			else {
 				$object->SetDBField('Url', $parent_item->GetDBField('FullUrl'));
 
 				$object->SetDBFieldsFromHash($parent_item->GetFieldValues(), Array('AltName', 'SameImages', 'LocalThumb', 'ThumbPath', 'ThumbUrl', 'LocalImage', 'LocalPath'));
 
 				if (!$object->GetDBField('AltName')) {
 					$object->SetDBField('AltName', $this->getItemTitle($parent_item));
 				}
 
 				$object->setLoaded();
 			}
 		}
 		else { // if requested image is not primary thumbnail - load it directly
 			$config = $this->getUnitConfig();
 			$id_field = $config->getForeignKey();
 			$parent_table_key = $config->getParentTableKey();
 
 			$keys[$id_field] = $parent_item->GetDBField($parent_table_key);
 
 			// which image to load?
 			if ($is_primary) {
 				// by PrimaryImage mark
 				$keys['DefaultImg'] = 1;
 			}
 			elseif ($image_name) {
 				// by ImageName
 				$keys['Name'] = $image_name;
 			}
 			elseif ($image_field) {
 				// by virtual field name in main object
 				$field_options = $parent_item->GetFieldOptions( $image_field );
 				$keys['Name'] = isset($field_options['original_field']) ? $field_options['original_field'] : $image_field;
 			}
 			elseif ($image_id) {
 				// by ID
 				$keys['ImageId'] = $image_id;
 			}
 			else {
 				// by PrimaryImage if no other criteria given
 				$keys['DefaultImg'] = 1;
 			}
 
 			$object->Load($keys);
 
 			if ( $image_field ) {
 				$image_src = $parent_item->GetDBField( $image_field );
 
 				// when image is uploaded to virtual field in main item, but not saved to db
 				$object->SetDBField('ThumbPath', $image_src);
 
 				if (!$object->isLoaded() && $image_src) {
 					// set fields for displaying new image during main item suggestion with errors
 					$fields_hash = Array (
 						'Url' => '',
 						'ThumbUrl' => '',
 						'LocalPath' => '',
 
 						'SameImages' => 1,
 						'LocalThumb' => 1,
 						'LocalImage' => 1,
 					);
 
 					$object->SetDBFieldsFromHash($fields_hash);
 					$object->setLoaded();
 				}
 			}
 		}
 	}
 
 	function getImageDimension($type, $params)
 	{
 		$ret = isset($params['Max'.$type]) ? $params['Max'.$type] : false;
 		if (!$ret) {
 			return $ret;
 		}
 		$parent_prefix = $this->getUnitConfig()->getParentPrefix();
 
 		if ($ret == 'thumbnail') {
 			$ret = $this->Application->ConfigValue($parent_prefix.'_ThumbnailImage'.$type);
 		}
 		if ($ret == 'fullsize') {
 			$ret = $this->Application->ConfigValue($parent_prefix.'_FullImage'.$type);
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Appends "/" to beginning of image path (in case when missing)
 	 *
 	 * @param kDBItem $object
 	 * @todo old in-portal doesn't append first slash, but we do => append first slash for him :)
 	 */
 	function makeRelativePaths(&$object)
 	{
 		$thumb_path = $object->GetDBField('ThumbPath');
 		if ($thumb_path && substr($thumb_path, 0, 1) != DIRECTORY_SEPARATOR) {
 			$object->SetDBField('ThumbPath', DIRECTORY_SEPARATOR . $thumb_path);
 		}
 
 		$local_path = $object->GetDBField('LocalPath');
 		if ($local_path && substr($local_path, 0, 1) != DIRECTORY_SEPARATOR) {
 			$object->SetDBField('LocalPath', DIRECTORY_SEPARATOR . $local_path);
 		}
 	}
 
 	function ImageSrc($params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		$this->makeRelativePaths($object);
 
 		// show "noimage.gif" when requested image is missing OR was not uploaded
 		$use_default_image = !(defined('DBG_IMAGE_RECOVERY') && DBG_IMAGE_RECOVERY);
 
 		$src_image_url = $this->_getImageUrl($params);
 		$src_image = $this->_getImagePath($src_image_url);
 
 		if (!$object->isLoaded() || ($src_image_url && $src_image)) {
 			// we can auto-resize image, when it is stored locally
 			$max_width = $this->getImageDimension('Width', $params);
 			$max_height = $this->getImageDimension('Height', $params);
 			$format = array_key_exists('format', $params) ? $params['format'] : false;
 
 			if (!$max_width && $format) {
 				// user watermarks from format param
 				$max_width = $format;
 			}
 
 			if ($max_width > 0 || $max_height > 0 || $format) {
 				list ($max_width, $max_height) = $this->_transformParams($params, $max_width, $max_height);
 
 				if ($object->isLoaded() && file_exists($src_image)) {
+					/** @var ImageHelper $image_helper */
 					$image_helper = $this->Application->recallObject('ImageHelper');
-					/* @var $image_helper ImageHelper */
 
 					return $image_helper->ResizeImage($src_image, $max_width, $max_height);
 				}
 				elseif ($use_default_image) {
 					return $this->_getDefaultImage($params, $max_width, $max_height);
 				}
 
 				return $src_image_url;
 			}
 		}
 
 		if ($src_image_url) {
 			// convert full url to full path!
 			$dst_image = $this->_getImagePath($src_image_url);
 			$image_found = $dst_image ? file_exists($dst_image) : true;
 
 			if ($image_found) {
 				// image isn't deleted OR is stored on remote location
 				return $src_image_url;
 			}
 		}
 
 		// return Default Image or false if NOT specified (only for case, when SameImages = 0)
 		return $use_default_image ? $this->_getDefaultImage($params) : $src_image_url;
 	}
 
 	/**
 	 * Get location on disk for images, stored locally and false for remote images
 	 *
 	 * @param string $src_image
 	 * @return string
 	 */
 	function _getImagePath($src_image)
 	{
 		if (!$src_image) {
 			return false;
 		}
 
+		/** @var FileHelper $file_helper */
 		$file_helper = $this->Application->recallObject('FileHelper');
-		/* @var $file_helper FileHelper */
 
 		$dst_image = $file_helper->urlToPath($src_image);
 
 		return $dst_image != $src_image ? $dst_image : false;
 	}
 
 	function _getImageUrl($params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		$base_url = rtrim($this->Application->BaseURL(), '/');
 
 		// if we need thumbnail, or full image is same as thumbnail
 		$show_thumbnail =	$this->SelectParam($params, 'thumbnail,Thumbnail') || // old style
 							(isset($params['MaxWidth']) && $params['MaxWidth'] == 'thumbnail') || // new style
 							(isset($params['MaxHeight']) && $params['MaxHeight'] == 'thumbnail');
 
 		if ($show_thumbnail || $object->GetDBField('SameImages')) {
 			// return local image or url
 			$ret = $object->GetDBField('LocalThumb') ? $base_url . $object->GetDBField('ThumbPath') : $object->GetDBField('ThumbUrl');
 		}
 		else { // if we need full which is not the same as thumb
 			$ret = $object->GetDBField('LocalImage') ? $base_url . $object->GetDBField('LocalPath') : $object->GetDBField('Url');
 		}
 
 		return $ret == $base_url ? '' : $ret;
 	}
 
 	/**
 	 * Transforms Image/ImageSrc aggregated tag parameters into ones, that ResizeImage method understands
 	 *
 	 * @param Array $params
 	 * @param int|bool $max_width
 	 * @param int|bool $max_height
 	 * @return Array
 	 */
 	function _transformParams($params, $max_width = false, $max_height = false)
 	{
 		$resize_format = 'resize:' . $max_width . 'x' . $max_height;
 
 		$crop = $this->SelectParam($params, 'Crop,crop');
 		if ($crop) {
 			if (strpos($crop, '|') === false) {
 				$crop = 'c|c';
 			}
 
 			$max_width = (is_null($max_height) ? $max_width : $resize_format) . ';crop:' . $crop;
 			$max_height = null;
 		}
 
 		$fill = $this->SelectParam($params, 'Fill,fill');
 		if ($fill) {
 			$max_width = (is_null($max_height) ? $max_width : $resize_format) . ';fill:' . $fill;
 			$max_height = null;
 		}
 
 		$watermark = $this->SelectParam($params, 'Watermark,watermark');
 		if ($watermark) {
 			$max_width = (is_null($max_height) ? $max_width : $resize_format) . ';wm:' . $watermark;
 			$max_height = null;
 		}
 
 		return Array ($max_width, $max_height);
 	}
 
 	/**
 	 * Returns default full url to default images
 	 *
 	 * @param Array $params
 	 * @param int|bool $max_width
 	 * @param int|bool $max_height
 	 * @return string
 	 */
 	function _getDefaultImage($params, $max_width = false, $max_height = false)
 	{
 		$default_image = $this->SelectParam($params, 'default_image,DefaultImage');
 		if (!$default_image) {
 			return '';
 		}
 
 		// show default image, use different base urls for admin and front-end
 		$base_url = rtrim($this->Application->BaseURL(), '/');
 		$sub_folder = $this->Application->isAdmin ? rtrim(IMAGES_PATH, '/') : THEMES_PATH;
 
 		if (($max_width !== false) || ($max_height !== false)) {
+			/** @var ImageHelper $image_helper */
 			$image_helper = $this->Application->recallObject('ImageHelper');
-			/* @var $image_helper ImageHelper */
 
 			$src_image = FULL_PATH . $sub_folder . '/' . $default_image;
 
 			return $image_helper->ResizeImage($src_image, $max_width, $max_height);
 		}
 
 		return $base_url . $sub_folder . '/' . $default_image;
 	}
 
 	function getFullPath($path)
 	{
 		if (!$path) {
 			return $path;
 		}
 
 		// absolute url
 		if (preg_match('/^(.*):\/\/(.*)$/U', $path)) {
+			/** @var FileHelper $file_helper */
 			$file_helper = $this->Application->recallObject('FileHelper');
-			/* @var $file_helper FileHelper */
 
 			return $file_helper->urlToPath($path);
 		}
 
 		// TODO: change to urlToPath usage later
 		// relative url (we add sort of <inp2:m_TemplatesBase/> does
 
 		return FULL_PATH . '/' . mb_substr(THEMES_PATH, 1) . '/' . kUtil::unescape($path, kUtil::ESCAPE_URL);
 	}
 
 	/**
 	 * Makes size clause for img tag, such as
 	 * ' width="80" height="100"' according to max_width
 	 * and max_heght limits.
 	 *
 	 * @param array $params
 	 * @return string
 	 */
 	function ImageSize($params)
 	{
 		$img_path = $this->getFullPath($params['img_path']);
 
+		/** @var ImageHelper $image_helper */
 		$image_helper = $this->Application->recallObject('ImageHelper');
-		/* @var $image_helper ImageHelper */
 
 		$max_width = $this->getImageDimension('Width', $params);
 		$max_height = $this->getImageDimension('Height', $params);
 
 		$image_dimensions = $image_helper->GetImageDimensions($img_path, $max_width, $max_height, $params);
 		if (!$image_dimensions) {
 			return false;
 		}
 
 		return ' width="'.$image_dimensions[0].'" height="'.$image_dimensions[1].'"';
 	}
 
 	/**
 	 * Prepares image parameters & parses block with them (for admin)
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function Image($params)
 	{
 		$image_url = $this->ImageSrc($params);
 
 		if ( !$image_url ) {
 			return '';
 		}
 
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		$params['img_path'] = $image_url;
 		$image_dimensions = $this->ImageSize($params);
 		$params['img_size'] = $image_dimensions ? $image_dimensions : ' width="' . $params['DefaultWidth'] . '"';
 		$params['alt'] = $object->GetField('AltName'); // really used ?
 		$params['name'] = $this->SelectParam($params, 'block,render_as');
 		$params['align'] = array_key_exists('align', $params) ? $params['align'] : 'left';
 		$params['no_editing'] = 1;
 
 		if ( !$object->isLoaded() && !$this->SelectParam($params, 'default_image,DefaultImage') ) {
 			return '';
 		}
 
 		// TODO: consider escaping in template instead
 		$params['alt'] = kUtil::escape($params['alt']);
 
 		$this->Application->Parser->DataExists = true;
 
 		return $this->Application->ParseBlock($params);
 	}
 
 	/**
 	 * Returns url for image in case when image source is url (for admin)
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function ImageUrl($params)
 	{
 		$object = $this->getObject($params);
 		if ($object->GetDBField('SameImages') ? $object->GetDBField('LocalThumb') : $object->GetDBField('LocalImage') ) {
 			$ret = $this->Application->Phrase(getArrayValue($params,'local_phrase'));
 		}
 		else {
 			$ret = $object->GetDBField('SameImages') ? $object->GetDBField('ThumbUrl') : $object->GetDBField('Url');
 		}
 		return $ret;
 	}
 
 	/**
 	 * If data was modfied & is in TempTables mode, then parse block with name passed;
 	 * remove modification mark if not in TempTables mode
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access public
 	 * @author Alexey
 	 */
 	function SaveWarning($params)
 	{
 		if ($this->Prefix == 'c-img') {
 			return $this->Application->ProcessParsedTag('c', 'SaveWarning', $params);
 		}
 
 		return parent::SaveWarning($params);
 	}
 }
Index: branches/5.3.x/core/units/images/image_event_handler.php
===================================================================
--- branches/5.3.x/core/units/images/image_event_handler.php	(revision 16518)
+++ branches/5.3.x/core/units/images/image_event_handler.php	(revision 16519)
@@ -1,474 +1,474 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class ImageEventHandler extends kDBEventHandler {
 
 	/**
 	 * Allows to override standard permission mapping
 	 *
 	 * @return void
 	 * @access protected
 	 * @see kEventHandler::$permMapping
 	 */
 	protected function mapPermissions()
 	{
 		parent::mapPermissions();
 
 		$permissions = Array (
 			'OnCleanImages' => Array ('subitem' => true),
 		);
 
 		$this->permMapping = array_merge($this->permMapping, $permissions);
 	}
 
 
 	/**
 	 * Define alternative event processing method names
 	 *
 	 * @return void
 	 * @see kEventHandler::$eventMethods
 	 * @access protected
 	 */
 	protected function mapEvents()
 	{
 		parent::mapEvents();	// ensure auto-adding of approve/decline and so on events
 
 		$image_events = Array (
 			'OnAfterCopyToTemp'=>'ImageAction',
 			'OnBeforeDeleteFromLive'=>'ImageAction',
 			'OnBeforeCopyToLive'=>'ImageAction',
 			'OnBeforeItemDelete'=>'ImageAction',
 			'OnAfterClone'=>'ImageAction',
 		);
 
 		$this->eventMethods = array_merge($this->eventMethods, $image_events);
 	}
 
 	/**
 	 * Returns special of main item for linking with sub-item
 	 *
 	 * @param kEvent $event
 	 * @return string
 	 * @access protected
 	 */
 	protected function getMainSpecial(kEvent $event)
 	{
 		if ( $event->Special == 'list' && !$this->Application->isAdmin ) {
 			// ListImages aggregated tag uses this special
 			return '';
 		}
 
 		return parent::getMainSpecial($event);
 	}
 
 	/**
 	 * Don't allow to delete primary category item image, when there are no more images
 	 *
 	 * @param kEvent $event
 	 * @param string $type
 	 * @return void
 	 * @access protected
 	 */
 	protected function customProcessing(kEvent $event, $type)
 	{
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		if ( $event->Name == 'OnMassDelete' && $type == 'before' ) {
 			$ids = $event->getEventParam('ids');
 
 			$parent_info = $object->getLinkedInfo($event->Special);
 
 			$sql = 'SELECT ImageId
 					FROM ' . $object->TableName . '
 					WHERE DefaultImg = 1 AND ' . $parent_info['ForeignKey'] . ' = ' . $parent_info['ParentId'];
 			$primary_file_id = $this->Conn->GetOne($sql);
 
 			if ( $primary_file_id ) {
 				$file_id_index = array_search($primary_file_id, $ids);
 
 				if ( $file_id_index ) {
 					// allow deleting of primary product file, when there is another file to make primary
 					$sql = 'SELECT COUNT(*)
 							FROM ' . $object->TableName . '
 							WHERE DefaultImg = 0 AND ' . $parent_info['ForeignKey'] . ' = ' . $parent_info['ParentId'];
 					$non_primary_file_count = $this->Conn->GetOne($sql);
 
 					if ( $non_primary_file_count ) {
 						unset($ids[$file_id_index]);
 					}
 				}
 			}
 
 			$event->setEventParam('ids', $ids);
 		}
 
 		switch ($type) {
 			case 'before' :
 				// empty unused fields
 				$object->SetDBField($object->GetDBField('LocalImage') ? 'Url' : 'LocalPath', '');
 				$object->SetDBField($object->GetDBField('LocalThumb') ? 'ThumbUrl' : 'ThumbPath', '');
 
 				if ( $object->GetDBField('SameImages') ) {
 					$object->SetDBField('LocalImage', 1);
 					$object->SetDBField('LocalPath', '');
 					$object->SetDBField('Url', '');
 				}
 				break;
 
 			case 'after':
 				// make sure, that there is only one primary image for the item
 				if ( $object->GetDBField('DefaultImg') ) {
 					$sql = 'UPDATE ' . $object->TableName . '
 							SET DefaultImg = 0
 							WHERE ResourceId = ' . $object->GetDBField('ResourceId') . ' AND ImageId <> ' . $object->GetID();
 					$this->Conn->Query($sql);
 				}
 				break;
 		}
 	}
 
 	/**
 	 * Performs temp-table related action on current image record
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function ImageAction($event)
 	{
 		$id = $event->getEventParam('id');
 
+		/** @var kDBItem $object */
 		$object = $this->Application->recallObject($event->Prefix . '.-item', $event->Prefix, Array ('skip_autoload' => true));
-		/* @var $object kDBItem */
 
 		if ( in_array($event->Name, Array ('OnBeforeDeleteFromLive', 'OnAfterClone')) ) {
 			$object->SwitchToLive();
 		}
 		elseif ( $event->Name == 'OnBeforeItemDelete' ) {
 			// keep current table
 		}
 		else {
 			$object->SwitchToTemp();
 		}
 
 		$object->Load($id);
 
+		/** @var FileHelper $file_helper */
 		$file_helper = $this->Application->recallObject('FileHelper');
-		/* @var $file_helper FileHelper */
 
 		$fields = Array ('LocalPath' => 'LocalImage', 'ThumbPath' => 'LocalThumb');
 
 		foreach ($fields as $a_field => $mode_field) {
 			$file = $object->GetDBField($a_field);
 
 			if ( !$file ) {
 				continue;
 			}
 
 			$source_file = FULL_PATH . $file;
 
 			switch ($event->Name) {
 				// Copy image files to pending dir and update corresponding fields in temp record
 				// Checking for existing files and renaming if necessary - two users may upload same pending files at the same time!
 				case 'OnAfterCopyToTemp':
 					$file = preg_replace('/^' . preg_quote(IMAGES_PATH, '/') . '/', IMAGES_PENDING_PATH, $file, 1);
 					$new_file = $file_helper->ensureUniqueFilename(FULL_PATH, $file);
 
 					$dst_file = FULL_PATH . $new_file;
 					copy($source_file, $dst_file);
 
 					$object->SetFieldOption($a_field, 'skip_empty', false);
 					$object->SetDBField($a_field, $new_file);
 					break;
 
 				// Copy image files to live dir (checking if file exists and renaming if necessary)
 				// and update corresponding fields in temp record (which gets copied to live automatically)
 				case 'OnBeforeCopyToLive':
 					if ( $object->GetDBField($mode_field) ) {
 						// if image is local -> rename file if it exists in live folder
 						$file = preg_replace('/^' . preg_quote(IMAGES_PENDING_PATH, '/') . '/', IMAGES_PATH, $file, 1);
 						$new_file = $file_helper->ensureUniqueFilename(FULL_PATH, $file);
 
 						$dst_file = FULL_PATH . $new_file;
 						rename($source_file, $dst_file);
 					}
 					else {
 						// if image is remote url - remove local file (if any), update local file field with empty value
 						if ( file_exists($source_file) ) {
 							@unlink($source_file);
 						}
 
 						$new_file = '';
 					}
 
 					$object->SetFieldOption($a_field, 'skip_empty', false);
 					$object->SetDBField($a_field, $new_file);
 					break;
 
 				case 'OnBeforeDeleteFromLive': // Delete image files from live folder before copying over from temp
 				case 'OnBeforeItemDelete': // Delete image files when deleting Image object
 					@unlink(FULL_PATH . $file);
 					break;
 
 				case 'OnAfterClone':
 					// Copy files when cloning objects, renaming it on the fly
 					$new_file = $file_helper->ensureUniqueFilename(FULL_PATH, $file);
 					$dst_file = FULL_PATH . $new_file;
 					copy($source_file, $dst_file);
 
 					$object->SetFieldOption($a_field, 'skip_empty', false);
 					$object->SetDBField($a_field, $new_file);
 					break;
 			}
 		}
 
 		if ( in_array($event->Name, Array ('OnAfterClone', 'OnBeforeCopyToLive', 'OnAfterCopyToTemp')) ) {
 			$object->Update(null, null, true);
 		}
 	}
 
 	/**
 	 * Sets primary image of user/category/category item
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnSetPrimary($event)
 	{
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		$object->SetDBField('DefaultImg', 1);
 		$object->Update();
 	}
 
 	/**
 	 * Occurs before updating item
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnBeforeItemUpdate(kEvent $event)
 	{
 		parent::OnBeforeItemUpdate($event);
 
 		$this->processImageStatus($event);
 	}
 
 	/**
 	 * Occurs after creating item
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnAfterItemCreate(kEvent $event)
 	{
 		parent::OnAfterItemCreate($event);
 
 		$this->processImageStatus($event);
 
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		$object->Update();
 	}
 
 	/**
 	 * Occurs before item changed
 	 *
 	 * @param kEvent $event
 	 */
 	function processImageStatus($event)
 	{
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		$id = $object->GetDBField('ResourceId');
 
 		$sql = 'SELECT ImageId
 				FROM ' . $object->TableName . '
 				WHERE ResourceId = ' . $id . ' AND DefaultImg = 1';
 		$primary_image_id = $this->Conn->GetOne($sql);
 
 		if ( !$primary_image_id ) {
 			$object->SetDBField('DefaultImg', 1);
 		}
 
 		if ( $object->GetDBField('DefaultImg') && $object->Validate() ) {
 			$sql = 'UPDATE ' . $object->TableName . '
 					SET DefaultImg = 0
 					WHERE ResourceId = ' . $id . ' AND ImageId <> ' . $object->GetDBField('ImageId');
 			$this->Conn->Query($sql);
 
 			$object->SetDBField('Enabled', 1);
 		}
 	}
 
 	/**
 	 * Apply any custom changes to list's sql query
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 * @see kDBEventHandler::OnListBuild()
 	 */
 	protected function SetCustomQuery(kEvent $event)
 	{
 		parent::SetCustomQuery($event);
 
+		/** @var kDBList $object */
 		$object = $event->getObject();
-		/* @var $object kDBList */
 
 		if ( !$this->Application->isAdminUser ) {
 			$object->addFilter('active', '%1$s.Enabled = 1');
 		}
 
 		$product_id = $event->getEventParam('product_id');
 
 		if ( $product_id ) {
 			$object->removeFilter('parent_filter');
 
 			$sql = 'SELECT ResourceId
 					FROM ' . $this->Application->getUnitConfig('p')->getTableName() . '
 					WHERE ProductId = ' . $product_id;
 			$resource_id = (int)$this->Conn->GetOne($sql);
 
 			$object->addFilter('product_images', '%1$s.ResourceId = ' . $resource_id);
 		}
 
+		/** @var kSearchHelper $search_helper */
 		$search_helper = $this->Application->recallObject('SearchHelper');
-		/* @var $search_helper kSearchHelper */
 
 		$types = $event->getEventParam('types');
 		$except_types = $event->getEventParam('except');
 		$type_clauses = $this->getTypeClauses($event);
 
 		$search_helper->SetComplexFilter($event, $type_clauses, $types, $except_types);
 	}
 
 	/**
 	 * Return type clauses for list bulding on front
 	 *
 	 * @param kEvent $event
 	 * @return Array
 	 */
 	function getTypeClauses($event)
 	{
 		$type_clauses = Array ();
 
 		$type_clauses['additional']['include'] = '%1$s.DefaultImg != 1';
 		$type_clauses['additional']['except'] = '%1$s.DefaultImg = 1';
 		$type_clauses['additional']['having_filter'] = false;
 
 		return $type_clauses;
 	}
 
 	/**
 	 * [SCHEDULED TASK] Remove unused images from "/system/images" and "/system/images/pending" folders
 	 *
 	 * @param kEvent $event
 	 */
 	function OnCleanImages($event)
 	{
 		// 1. get images, that are currently in use
 		$active_images = $this->_getActiveImages( $this->Application->getUnitConfig('img')->getTableName() );
 		$active_images[] = 'noimage.gif';
 
 		// 2. get images on disk
 		$this->_deleteUnusedImages(FULL_PATH . IMAGES_PATH, $active_images);
 
 		// 3. get images in use from "images/pending" folder
 		$active_images = $this->_getPendingImages();
 
 		// 4. get image on disk
 		$this->_deleteUnusedImages(FULL_PATH . IMAGES_PENDING_PATH, $active_images);
 	}
 
 	/**
 	 * Gets image filenames (no path) from given table
 	 *
 	 * @param string $image_table
 	 * @return Array
 	 */
 	function _getActiveImages($image_table)
 	{
 		$sql = 'SELECT LocalPath, ThumbPath
 				FROM ' . $image_table . '
 				WHERE COALESCE(LocalPath, "") <> "" OR COALESCE(ThumbPath) <> ""';
 		$images = $this->Conn->Query($sql);
 
 		$active_images = Array ();
 		foreach ($images as $image) {
 			if ($image['LocalPath']) {
 				$active_images[] = basename($image['LocalPath']);
 			}
 
 			if ($image['ThumbPath']) {
 				$active_images[] = basename($image['ThumbPath']);
 			}
 		}
 
 		return $active_images;
 	}
 
 	/**
 	 * Gets active images, that are currently beeing edited inside temporary tables
 	 *
 	 * @return Array
 	 */
 	function _getPendingImages()
 	{
 		$tables = $this->Conn->GetCol('SHOW TABLES');
 		$mask_edit_table = '/'.TABLE_PREFIX.'ses_(.*)_edit_' . TABLE_PREFIX . 'CatalogImages/';
 
 		$active_images = Array ();
 
 		foreach ($tables as $table) {
 			if (!preg_match($mask_edit_table, $table)) {
 				continue;
 			}
 
 			$active_images = array_unique( array_merge($active_images, $this->_getActiveImages($table)) );
 		}
 
 		return $active_images;
 	}
 
 	/**
 	 * Deletes all files in given path, except of given $active_images
 	 *
 	 * @param string $path
 	 * @param Array $active_images
 	 */
 	function _deleteUnusedImages($path, &$active_images)
 	{
 		$images = glob($path . '*.*');
 		if ($images) {
 			$images = array_map('basename', $images);
 
 			// delete images, that are on disk, but are not mentioned in CatalogImages table
 			$delete_images = array_diff($images, $active_images);
 			foreach ($delete_images as $delete_image) {
 				unlink($path . $delete_image);
 			}
 		}
 	}
 
 }
Index: branches/5.3.x/core/units/configuration/configuration_tag_processor.php
===================================================================
--- branches/5.3.x/core/units/configuration/configuration_tag_processor.php	(revision 16518)
+++ branches/5.3.x/core/units/configuration/configuration_tag_processor.php	(revision 16519)
@@ -1,294 +1,294 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class ConfigurationTagProcessor extends kDBTagProcessor {
 
 	public function __construct()
 	{
 		parent::__construct();
 
 		$this->Application->LinkVar('module_key');
 	}
 
 	/**
 	 * Prints list content using block specified
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access public
 	 */
 	function PrintList($params)
 	{
 		$list =& $this->GetList($params);
 		$id_field = $this->getUnitConfig()->getIDField();
 
 		$list->Query();
 		$o = '';
 		$list->GoFirst();
 
 		$block_params = $this->prepareTagParams($params);
 		$block_params['pass_params'] = 'true';
 		$block_params['IdField'] = $list->IDField;
 
 		$prev_heading = '';
 		$next_block = $params['full_block'];
 		$list->groupRecords('Heading');
 		$field_values = $this->Application->GetVar($this->getPrefixSpecial(true));
 
 		while (!$list->EOL()) {
 			$this->Application->SetVar($this->getPrefixSpecial() . '_id', $list->GetDBField($id_field)); // for edit/delete links using GET
 
 			// using 2 blocks for drawing o row in case if current & next record titles match
 			$next_record =& $list->getCurrentRecord(1);
 			$this_key = $list->GetDBField('Prompt') . ':' . $list->GetDBField('DisplayOrder');
 			$next_key = $next_record !== false ? $next_record['Prompt'] . ':' . $next_record['DisplayOrder'] : '';
 
 			if ( $next_key == $this_key ) {
 				$curr_block = $params['half_block1'];
 				$next_block = $params['half_block2'];
 			}
 			else {
 				$curr_block = $next_block;
 				$next_block = $params['full_block'];
 			}
 
 			$variable_name = $list->GetDBField('VariableName');
 
 			// allows to override value part of block
 			if ( $this->Application->ParserBlockFound('cf_' . $variable_name . '_value') ) {
 				$block_params['value_render_as'] = 'cf_' . $variable_name . '_value';
 			}
 			else {
 				$block_params['value_render_as'] = $params['value_render_as'];
 			}
 
 			// allow to completely override whole block
 			if ( $this->Application->ParserBlockFound('cf_' . $variable_name . '_element') ) {
 				$block_params['name'] = 'cf_' . $variable_name . '_element';
 				$block_params['original_render_as'] = $curr_block;
 			}
 			else {
 				$block_params['name'] = $curr_block;
 				$block_params['original_render_as'] = $curr_block;
 			}
 
 			$block_params['show_heading'] = ($prev_heading != $list->GetDBField('Heading')) ? 1 : 0;
 
 			// set values from submit if any
 			if ( $field_values ) {
 				$list->SetDBField('VariableValue', $field_values[$list->GetID()]['VariableValue']);
 			}
 			$list->SetDBField('DirectOptions', '');
 
 			$o .= $this->Application->ParseBlock($block_params);
 			$prev_heading = $list->GetDBField('Heading');
 			$list->GoNext();
 		}
 
 		$this->Application->RemoveVar('ModuleRootCategory');
 		$this->Application->SetVar($this->getPrefixSpecial() . '_id', '');
 
 		return $o;
 	}
 
 	function getModuleItemName()
 	{
 		$module = $this->Application->GetVar('module');
 		$table = $this->Application->getUnitConfig('confs')->getTableName();
 
 		$sql = 'SELECT ConfigHeader
 				FROM ' . $table . '
 				WHERE ModuleName = ' . $this->Conn->qstr($module);
 
 		return $this->Conn->GetOne($sql);
 	}
 
 	function PrintConfList($params)
 	{
 		$list =& $this->GetList($params);
 
 		$list->Query();
 		$list->GoFirst();
 
 		$tmp_row = Array ();
 
 		while ( !$list->EOL() ) {
 			$rec = $list->getCurrentRecord();
 			$tmp_row[0][$rec['VariableName']] = $rec['VariableValue'];
 			$tmp_row[0][$rec['VariableName'] . '_prompt'] = $rec['Prompt'];
 			$list->GoNext();
 		}
 
 		$list->Records = $tmp_row;
 
 		$block_params = $this->prepareTagParams($params);
 		$block_params['name'] = $this->SelectParam($params, 'render_as,block');
 		$block_params['module_key'] = $this->Application->GetVar('module_key');
 		$block_params['module_item'] = $this->getModuleItemName();
 		$list->GoFirst();
 
 		return $this->Application->ParseBlock($block_params);
 
 	}
 
 	function ShowRelevance($params)
 	{
 		return $this->Application->GetVar('module_key') != '_';
 	}
 
 	function ConfigValue($params)
 	{
 		return $this->Application->ConfigValue($params['name']);
 	}
 
 	function IsRequired($params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		$field = $params['field'];
 		$field_options = $object->GetFieldOptions($field);
 
 		if ( $field == 'VariableValue' ) {
 			$custom_options = $object->GetDBField('Validation');
 
 			if ( $custom_options ) {
 				$field_options = array_merge($field_options, unserialize($custom_options));
 			}
 		}
 
 		return isset($field_options['required']) && $field_options['required'];
 	}
 
 	function Error($params)
 	{
+		/** @var kDBList $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBList */
 
 		if ( !($object instanceof kDBList) ) {
 			return parent::Error($params);
 		}
 
 		$field = $object->GetDBField($params['id_field']);
 		$errors = $this->Application->GetVar('errors_' . $this->getPrefixSpecial(), Array ());
 
 		return array_key_exists($field, $errors) ? $errors[$field] : '';
 	}
 
 	/**
 	 * Allows to show category path of selected module
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function CategoryPath($params)
 	{
 		if (!isset($params['cat_id'])) {
 			$params['cat_id'] = $this->ModuleRootCategory( Array() );
 		}
 
+		/** @var kNavigationBar $navigation_bar */
 		$navigation_bar = $this->Application->recallObject('kNavigationBar');
-		/* @var $navigation_bar kNavigationBar */
 
 		return $navigation_bar->build($params);
 	}
 
 	/**
 	 * Shows edit warning in case if module root category changed but not saved
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function SaveWarning($params)
 	{
 		$temp_category_id = $this->Application->RecallVar('ModuleRootCategory');
 		if ($temp_category_id !== false) {
 			return $this->Application->ParseBlock($params);
 		}
 		return '';
 	}
 
 	function ModuleRootCategory($params)
 	{
 		$category_id = $this->Application->RecallVar('ModuleRootCategory');
 		if ($category_id === false) {
 			$category_id = $this->Application->findModule('Name', $this->Application->GetVar('module'), 'RootCat');
 		}
 		return $category_id;
 	}
 
 	/**
 	 * Returns variable ID by it's name (used on search relevance configuration screen)
 	 *
 	 * @param Array $params
 	 * @return int
 	 */
 	function GetVariableID($params)
 	{
 		static $cached_ids = Array ();
 
 		$var_name = $params['name'];
 
 		if ( !isset($cached_ids[$var_name]) ) {
 			$config = $this->getUnitConfig();
 
 			$sql = 'SELECT ' . $config->getIDField() . '
 					FROM ' . $config->getTableName() . '
 					WHERE VariableName = ' . $this->Conn->qstr($params['name']);
 			$cached_ids[$var_name] = $this->Conn->GetOne($sql);
 		}
 
 		return $cached_ids[$var_name];
 	}
 
 	function GetVariableSection($params)
 	{
 		static $cached_sections = Array ();
 
 		$var_name = $params['name'];
 
 		if ( !isset($cached_sections[$var_name]) ) {
 			$sql = 'SELECT Section
 					FROM ' . $this->getUnitConfig()->getTableName() . '
 					WHERE VariableName = ' . $this->Conn->qstr($params['name']);
 			$cached_sections[$var_name] = $this->Conn->GetOne($sql);
 		}
 
 		return $cached_sections[$var_name];
 	}
 
 	/**
 	 * Returns system setting editing link
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function ItemEditLink($params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		$params['m_opener'] = 'd';
 		$params[$object->Prefix . '_mode'] = 't';
 		$params[$object->Prefix . '_event'] = 'OnEdit';
 		$params[$object->Prefix . '_id'] = $object->GetID();
 		$params['pass'] = 'all,' . $object->Prefix;
 
 		return $this->Application->ProcessParsedTag('m', 'Link', $params);
 
 	}
 }
\ No newline at end of file
Index: branches/5.3.x/core/units/configuration/configuration_event_handler.php
===================================================================
--- branches/5.3.x/core/units/configuration/configuration_event_handler.php	(revision 16518)
+++ branches/5.3.x/core/units/configuration/configuration_event_handler.php	(revision 16519)
@@ -1,600 +1,600 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class ConfigurationEventHandler extends kDBEventHandler  {
 
 		/**
 		 * Allows to override standard permission mapping
 		 *
 		 * @return void
 		 * @access protected
 		 * @see kEventHandler::$permMapping
 		 */
 		protected function mapPermissions()
 		{
 			parent::mapPermissions();
 
 			$permissions = Array (
 				'OnGenerateMaintenancePage' => Array ('self' => 'add|edit'),
 			);
 
 			$this->permMapping = array_merge($this->permMapping, $permissions);
 		}
 
 		/**
 		 * Changes permission section to one from REQUEST, not from config
 		 *
 		 * @param kEvent $event
 		 * @return bool
 		 * @access public
 		 */
 		public function CheckPermission(kEvent $event)
 		{
 			$event->setEventParam('PermSection', $this->Application->GetVar('section'));
 			return parent::CheckPermission($event);
 		}
 
 		/**
 		 * Apply any custom changes to list's sql query
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
 		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			$module = $this->Application->GetVar('module');
 			$section = $this->Application->GetVar('section');
 
 			$object->addFilter('module_filter', '%1$s.ModuleOwner = ' . $this->Conn->qstr($module));
 			$object->addFilter('section_filter', '%1$s.Section = ' . $this->Conn->qstr($section));
 
 			$can_change = $this->Application->ConfigValue('AllowAdminConsoleInterfaceChange');
 
 			if ( !$can_change && !$this->Application->isDebugMode() ) {
 				$object->addFilter('interface_change_filter', '%1$s.VariableName NOT IN ("AdminConsoleInterface", "AllowAdminConsoleInterfaceChange")');
 			}
 
 			if ( defined('IS_INSTALL') && IS_INSTALL ) {
 				$object->addFilter('install_filter', '%1$s.Install = 1');
 			}
 
 			$object->addFilter('visible_filter', '%1$s.Heading <> ""');
 		}
 
 		/**
 		 * Presets new system setting fields
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnPreCreate(kEvent $event)
 		{
 			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'));
 		}
 
 		/**
 		 * Sets custom validation
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemLoad(kEvent $event)
 		{
 			static $default_field_options = null;
 
 			parent::OnAfterItemLoad($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			// ability to validate each configuration variable separately
 			if ( !isset($default_field_options) ) {
 				$default_field_options = $object->GetFieldOptions('VariableValue');
 			}
 
 			$new_field_options = $default_field_options;
 			$validation = $object->GetDBField('Validation');
 
 			if ( $validation ) {
 				$new_field_options = array_merge($new_field_options, unserialize($validation));
 			}
 
 			$object->SetFieldOptions('VariableValue', $new_field_options);
 		}
 
 		/**
 		 * Performs custom validation
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemValidate(kEvent $event)
 		{
 			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')));
 				}
 			}
 
 			$this->_processCountryState($event);
 
 			$variable_name = $object->GetDBField('VariableName');
 			$new_value = $object->GetDBField('VariableValue');
 
 			if ( $variable_name == 'AdminConsoleInterface' ) {
 				$can_change = $this->Application->ConfigValue('AllowAdminConsoleInterfaceChange');
 
 				if ( ($new_value != $object->GetOriginalField('VariableValue')) && !$can_change ) {
 					$object->SetError('VariableValue', 'not_allowed', 'la_error_OperationNotAllowed');
 				}
 			}
 			elseif ( $variable_name == 'HardMaintenanceTemplate' ) {
 				$compile = $event->MasterEvent->getEventParam('compile_maintenance_template');
 				$compile = $compile || $new_value != $object->GetOriginalField('VariableValue');
 
 				if ( $compile && !$this->_generateMaintenancePage($new_value) ) {
 					$object->SetError('VariableValue', 'template_file_missing', 'la_error_TemplateFileMissing');
 				}
 			}
 			elseif ( $variable_name == 'DefaultEmailRecipients' ) {
 				$email_event_data = $this->Application->GetVar('email-template_' . $event->Prefix);
 				$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');
 
 			if ( $section && !$sections_helper->getSectionData($section) ) {
 				$object->SetError('Section', 'unknown_section');
 			}
 		}
 
 		/**
 		 * Checks, that state belongs to selected country
 		 *
 		 * @param kEvent $event
 		 * @access protected
 		 */
 		protected function _processCountryState(kEvent $event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$country_iso = $this->_getCountryByState($event);
 			$state_name = $object->GetDBField('VariableValue');
 
 			if ( !$country_iso || !$state_name ) {
 				return;
 			}
 
+			/** @var kCountryStatesHelper $cs_helper */
 			$cs_helper = $this->Application->recallObject('CountryStatesHelper');
-			/* @var $cs_helper kCountryStatesHelper */
 
 			$state_iso = $cs_helper->getStateIso($state_name, $country_iso);
 
 			if ( $state_iso !== false ) {
 				$object->SetDBField('VariableValue', $state_iso);
 			}
 			else {
 				// selected state doesn't belong to selected country
 				$object->SetError('VariableValue', 'invalid_state', 'la_InvalidState');
 			}
 		}
 
 		/**
 		 * Returns country iso code, that matches current state variable name
 		 *
 		 * @param kEvent $event
 		 * @return bool
 		 * @access protected
 		 */
 		protected function _getCountryByState(kEvent $event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$variable_name = $object->GetDBField('VariableName');
 
 			$state_country_hash = Array (
 				'Comm_State' => 'Comm_Country',
 				'Comm_Shipping_State' => 'Comm_Shipping_Country'
 			);
 
 			if ( !array_key_exists($variable_name, $state_country_hash) ) {
 				return false;
 			}
 
 			$field_values = $this->Application->GetVar($event->getPrefixSpecial(true));
 
 			$sql = 'SELECT VariableId
 					FROM ' . $event->getUnitConfig()->getTableName() . '
 					WHERE VariableName = ' . $this->Conn->qstr($state_country_hash[$variable_name]);
 			$country_variable_id = $this->Conn->GetOne($sql);
 
 			return $field_values[$country_variable_id]['VariableValue'];
 		}
 
 		/**
 		 * Does custom password setting processing
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemUpdate(kEvent $event)
 		{
 			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')) == '' ) {
 				$object->SetFieldOption('VariableValue', 'skip_empty', 1);
 			}
 		}
 
 		/**
 		 * Occurs after updating item
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemUpdate(kEvent $event)
 		{
 			static $skin_deleted = false;
 
 			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);
 			}
 
 			// allows to check if variable's value was changed now
 			$variable_name = $object->GetDBField('VariableName');
 			$changed = $this->Application->GetVar($event->getPrefixSpecial() . '_changed', Array ());
 
 			if ( $object->GetDBField('VariableValue') != $object->GetOriginalField('VariableValue') ) {
 				$changed[] = $variable_name;
 				$this->Application->SetVar($event->getPrefixSpecial() . '_changed', $changed);
 
 				// update value in cache, so other code (during this script run) would use new value
 				$this->Application->SetConfigValue($variable_name, $object->GetDBField('VariableValue'), true);
 
 				$sorting_prefix = $this->getSortingPrefix($variable_name);
 
 				if ( $sorting_prefix ) {
 					$sql = 'DELETE FROM ' . TABLE_PREFIX . 'UserPersistentSessionData
 							WHERE VariableName LIKE "' . $sorting_prefix . '%Sortings.%"';
 					$this->Conn->Query($sql);
 				}
 			}
 
 			if ( $variable_name == 'Require_AdminSSL' || $variable_name == 'AdminSSLDomain' ) {
 				// 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) ) {
 						unlink($skin_file);
 					}
 
 					$skin_deleted = true;
 				}
 			}
 		}
 
 		/**
 		 * Returns prefix, related to given sorting system setting
 		 *
 		 * @param string $system_setting System setting.
 		 *
 		 * @return boolean|string
 		 */
 		protected function getSortingPrefix($system_setting)
 		{
 			foreach ( $this->Application->ModuleInfo as $module_info ) {
 				if ( $module_info['Name'] == 'In-Portal' ) {
 					continue;
 				}
 
 				$prefix = ($module_info['Var'] == 'adm') ? 'c' : $module_info['Var'];
 				$config_mapping = $this->Application->getUnitConfig($prefix)->getConfigMapping();
 
 				if ( (isset($config_mapping['DefaultSorting1Field'])
 					&& $system_setting == $config_mapping['DefaultSorting1Field'])
 					|| (isset($config_mapping['DefaultSorting2Field'])
 					&& $system_setting == $config_mapping['DefaultSorting2Field'])
 				) {
 					return $prefix;
 				}
 			}
 
 			return false;
 		}
 
 		/**
 		 * Updates kDBItem
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnUpdate(kEvent $event)
 		{
 			if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
 				$event->status = kEvent::erFAIL;
 				return;
 			}
 
 			$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
 
 			// 1. save user selected module root category
 			$new_category_id = getArrayValue($items_info, 'ModuleRootCategory', 'VariableValue');
 			if ( $new_category_id !== false ) {
 				unset($items_info['ModuleRootCategory']);
 			}
 
+			/** @var kDBItem $object */
 			$object = $event->getObject( Array('skip_autoload' => true) );
-			/* @var $object kDBItem */
 
 			if ( $items_info ) {
 				$has_error = false;
 
 				foreach ($items_info as $id => $field_values) {
 					$object->Clear(); // clear validation errors from previous variable
 					$object->Load($id);
 					$object->SetFieldsFromHash($field_values);
 					$event->setEventParam('form_data', $field_values);
 
 					if ( !$object->Update($id) ) {
 						// don't stop when error found !
 						$has_error = true;
 					}
 				}
 
 				$event->status = $has_error ? kEvent::erFAIL : kEvent::erSUCCESS;
 			}
 
 			if ( $event->status == kEvent::erSUCCESS ) {
 				$event->SetRedirectParam('action_completed', 1);
 
 				if ( $new_category_id !== false ) {
 					// root category was submitted
 					$module = $this->Application->GetVar('module');
 					$root_category_id = $this->Application->findModule('Name', $module, 'RootCat');
 
 					if ( $root_category_id != $new_category_id ) {
 						// root category differs from one in db
 						$fields_hash = Array ('RootCat' => $new_category_id);
 						$this->Conn->doUpdate($fields_hash, TABLE_PREFIX . 'Modules', 'Name = ' . $this->Conn->qstr($module));
 					}
 				}
 
 				// reset cache
 				$changed = $this->Application->GetVar($event->getPrefixSpecial() . '_changed', Array ());
 				$require_refresh = Array ('AdvancedUserManagement', 'Site_Name', 'AdminConsoleInterface', 'UsePopups', 'Catalog_PreselectModuleTab');
 
 				$refresh_sections = array_intersect($require_refresh, $changed);
 				$require_full_refresh = Array ('Site_Name', 'AdminConsoleInterface');
 
 				if ( array_intersect($require_full_refresh, $changed) ) {
 					$event->SetRedirectParam('refresh_all', 1);
 				}
 				elseif ( $refresh_sections ) {
 					$event->SetRedirectParam('refresh_tree', 1);
 				}
 
 				if ( $refresh_sections ) {
 					// reset sections too, because of AdvancedUserManagement
 					$this->Application->DeleteSectionCache();
 				}
 
 				$this->Application->DeleteUnitCache($changed);
 			}
 			else{
 				$errors = $this->Application->GetVar('errors_' . $event->getPrefixSpecial());
 
 				if ( $errors ) {
 					// because we have list out there, and this is item
 					$this->Application->SetVar('first_error', key($errors));
 					$this->Application->removeObject($event->getPrefixSpecial());
 				}
 			}
 
 			// keeps module and section in REQUEST to ensure, that last admin template will work
 			$event->SetRedirectParam('module', $this->Application->GetVar('module'));
 			$event->SetRedirectParam('section', $this->Application->GetVar('section'));
 		}
 
 		/**
 		 * Process items from selector (selected_ids var, key - prefix, value - comma separated ids)
 		 *
 		 * @param kEvent $event
 		 */
 		function OnProcessSelected($event)
 		{
 			$selected_ids = $this->Application->GetVar('selected_ids');
 			$this->Application->StoreVar('ModuleRootCategory', $selected_ids['c']);
 
 			$event->SetRedirectParam('opener', 'u');
 		}
 
 		/**
 		 * Generates maintenance page
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnGenerateMaintenancePage(kEvent $event)
 		{
 			$event->setEventParam('compile_maintenance_template', 1);
 
 			$event->CallSubEvent('OnUpdate');
 		}
 
 		/**
 		 * Generates HTML version of hard maintenance template
 		 *
 		 * @param string $template
 		 * @return bool
 		 * @access protected
 		 */
 		protected function _generateMaintenancePage($template = null)
 		{
 			if ( !isset($template) ) {
 				$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);
 
 			if ( $curl_helper->isGoodResponseCode() ) {
 				file_put_contents(WRITEABLE . DIRECTORY_SEPARATOR . 'maintenance.html', $html);
 
 				return true;
 			}
 
 			return false;
 		}
 
 		/**
 		 * Returns auto-complete values for ajax-dropdown
 		 *
 		 * @param kEvent $event Event.
 		 * @param string $term Term.
 		 *
 		 * @return Array
 		 * @access protected
 		 */
 		protected function getAutoCompleteSuggestions(kEvent $event, $term)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$field = $this->Application->GetVar('field');
 
 			if ( !$field || !$term || !$object->isField($field) ) {
 				return array();
 			}
 
 			$limit = $this->Application->GetVar('limit');
 
 			if ( !$limit ) {
 				$limit = 20;
 			}
 
 			$sql = 'SELECT DISTINCT ' . $field . ', ModuleOwner
 					FROM ' . $event->getUnitConfig()->getTableName() . '
 					WHERE ' . $field . ' LIKE ' . $this->Conn->qstr('%' . $term . '%') . '
 					ORDER BY ' . $field . ' ASC';
 			$data = $this->Conn->Query($sql);
 
 			$suggestions = array();
 
 			foreach ($data as $raw_suggestion) {
 				$suggestion = $raw_suggestion[$field];
 
 				if ( !isset($suggestions[$suggestion]) ) {
 					$suggestions[$suggestion] = array();
 				}
 
 				$suggestions[$suggestion][] = $raw_suggestion['ModuleOwner'];
 			}
 
 			array_splice($suggestions, $limit);
 
 			$ret = array();
 			$of_label = $this->Application->Phrase('la_From', false);
 
 			foreach ($suggestions as $suggestion_value => $suggestion_modules) {
 				$suggestion_module = in_array('In-Portal', $suggestion_modules) ? 'In-Portal' : implode(', ', $suggestion_modules);
 				$suggestion_title = $suggestion_value . ' <em style="color: grey;">' . $of_label . ' ' . $suggestion_module . '</em>';
 
 				$ret[$suggestion_value] = $suggestion_title;
 			}
 
 			return $ret;
 		}
 
 		/**
 		 * Prefills module dropdown
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterConfigRead(kEvent $event)
 		{
 			parent::OnAfterConfigRead($event);
 
 			$options = Array ();
 
 			foreach ($this->Application->ModuleInfo as $module_name => $module_info) {
 				if ( $module_name == 'Core' ) {
 					continue;
 				}
 
 				$options[$module_name] = $module_name;
 
 				if ( $module_name == 'In-Portal' ) {
 					$options['In-Portal:Users'] = 'In-Portal:Users';
 				}
 			}
 
 			$config = $event->getUnitConfig();
 
 			$fields = $config->getFields();
 			$fields['ModuleOwner']['options'] = $options;
 			$config->setFields($fields);
 		}
 	}
Index: branches/5.3.x/core/units/filters/item_filter_eh.php
===================================================================
--- branches/5.3.x/core/units/filters/item_filter_eh.php	(revision 16518)
+++ branches/5.3.x/core/units/filters/item_filter_eh.php	(revision 16519)
@@ -1,158 +1,158 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class ItemFilterEventHandler extends kDBEventHandler {
 
 	/**
 	 * Allows to override standard permission mapping
 	 *
 	 * @return void
 	 * @access protected
 	 * @see kEventHandler::$permMapping
 	 */
 	protected function mapPermissions()
 	{
 		parent::mapPermissions();
 
 		$permissions = Array (
 			'OnItemBuild' => Array ('self' => true),
 		);
 
 		$this->permMapping = array_merge($this->permMapping, $permissions);
 	}
 
 	/**
 	 * Apply any custom changes to list's sql query
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 * @see kDBEventHandler::OnListBuild()
 	 */
 	protected function SetCustomQuery(kEvent $event)
 	{
 		parent::SetCustomQuery($event);
 
 		if ( !$this->Application->isAdmin ) {
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			$prefix_info = $this->Application->processPrefix($event->getEventParam('prefix'));
 
 			$object->addFilter('prefix_filter', '%1$s.ItemPrefix = ' . $this->Conn->qstr($prefix_info['prefix']));
 			$object->addFilter('status_filter', '%1$s.Enabled = 1');
 
 			if ( $event->Special == 'used' ) {
 				$filters = array_keys($this->Application->GetVar('filters', Array ()));
 
 				if ( $filters ) {
 					$filters = $this->Conn->qstrArray($filters);
 					$object->addFilter('field_filter', '%1$s.FilterField IN (' . implode(',', $filters) . ')');
 				}
 				else {
 					$object->addFilter('field_filter', 'FALSE');
 				}
 			}
 
 			$exclude_filters = $this->Application->GetVar('exclude_filters');
 
 			if ( $exclude_filters ) {
 				$exclude_filters = $this->Conn->qstrArray(explode(',', $exclude_filters));
 				$object->addFilter('field_filter', '%1$s.FilterField NOT IN (' . implode(',', $exclude_filters) . ')');
 			}
 
 			if ( $event->getEventParam('per_page') === false ) {
 				$event->setEventParam('per_page', -1);
 			}
 		}
 	}
 
 	/**
 	 * Validates filter settings
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnBeforeItemValidate(kEvent $event)
 	{
 		parent::OnBeforeItemValidate($event);
 
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		$prefix = $object->GetDBField('ItemPrefix');
 
 		if ( $prefix ) {
 			if ( !$this->Application->prefixRegistred($prefix) ) {
 				$object->SetError('ItemPrefix', 'not_registered');
 			}
 
 			$field = $object->GetDBField('FilterField');
 
 			if ( $field ) {
 				$config = $this->Application->getUnitConfig($prefix);
 
 				if ( !$config->getFieldByName($field) && !$config->getVirtualFieldByName($field) ) {
 					$object->SetError('FilterField', 'non_existing', null, Array ($prefix));
 				}
 			}
 		}
 
 		$object->setRequired('RangeCount', $object->GetDBField('FilterType') == 'range');
 	}
 
 	/**
 	 * Load item if id is available
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function LoadItem(kEvent $event)
 	{
 		static $cache = null;
 
 		if ( $this->Application->isAdmin ) {
 			parent::LoadItem($event);
 
 			return;
 		}
 
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		if ( !isset($cache) ) {
 			$cache = $this->Conn->Query($object->GetSelectSQL(), 'FilterKey');
 		}
 
 		$filter_key = $event->getEventParam('prefix') . '_' . $event->getEventParam('field');
 
 		if ( isset($cache[$filter_key]) ) {
 			$object->LoadFromHash($cache[$filter_key]);
 		}
 
 		if ( $object->isLoaded() ) {
+			/** @var Params $actions */
 			$actions = $this->Application->recallObject('kActions');
-			/* @var $actions Params */
 
 			$actions->Set($event->getPrefixSpecial() . '_id', $object->GetID());
 		}
 		else {
 			$object->setID(false);
 		}
 	}
 }
Index: branches/5.3.x/core/units/filters/item_filter_tp.php
===================================================================
--- branches/5.3.x/core/units/filters/item_filter_tp.php	(revision 16518)
+++ branches/5.3.x/core/units/filters/item_filter_tp.php	(revision 16519)
@@ -1,322 +1,322 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class ItemFilterTagProcessor extends kDBTagProcessor {
 
 	/**
 	 * Allows to modify block params & current list record before PrintList parses record
 	 *
 	 * @param kDBList $object
 	 * @param Array $block_params
 	 * @return void
 	 * @access protected
 	 */
 	protected function PrepareListElementParams(&$object, &$block_params)
 	{
 		if ( $this->Application->isAdmin ) {
 			return ;
 		}
 
 		$block_params['filter_field'] = $object->GetDBField('FilterField');
 		$block_params['filter_type'] = $object->GetDBField('FilterType');
 	}
 
 	/**
 	 * Lists filter options
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function ListFilterOptions($params)
 	{
 		static $cache = Array ();
 
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		// get item list to be filtered
 		$this->Application->ProcessParsedTag($params['prefix'], 'InitList', $params);
 		$tag_processor = $this->Application->recallTagProcessor( $params['prefix'] );
 		$item_list = $tag_processor->GetList($params);
 
 		$filter_type = $object->GetDBField('FilterType');
 		$filter_field = $object->GetDBField('FilterField');
 		$cache_key = $filter_field . '_' . $filter_type;
 
 		if ( !isset($cache[$cache_key]) ) {
 			$cache[$cache_key] = Array ('counts' => Array (), 'options' => Array ());
 
 			$field_sql = $item_list->isCalculatedField($filter_field) ? $item_list->extractCalculatedFields('`' . $filter_field . '`', 1, true) : '`' . $item_list->TableName . '`.`' . $filter_field . '`';
 			$sql = $item_list->getCountSQL( $item_list->GetSelectSQL(true, false, $field_sql) );
 
 			if ( in_array($filter_type, Array ('select', 'radio', 'checkbox')) ) {
 				$options = $item_list->GetFieldOption($filter_field, 'options', false, Array ());
 
 				if ( $item_list->GetFieldOption($filter_field, 'use_phrases') ) {
 					$options = array_map(Array (&$this->Application, 'Phrase'), $options);
 				}
 
 				$cache[$cache_key]['options'] = $options;
 
 				$count_sql = str_replace('COUNT(*) AS count', 'COUNT(*), ' . $field_sql . ' AS GroupField', $sql) . ' GROUP BY GroupField';
 				$cache[$cache_key]['counts'] = $this->Conn->GetCol($count_sql, 'GroupField');
 			}
 			elseif ( $filter_type == 'range' ) {
 				$filter_params = $this->Application->GetVar('filter_params', Array ());
 				$filter_params = isset($filter_params[$filter_field]) ? $filter_params[$filter_field] : Array ();
 
 				if ( isset($filter_params['max_value']) ) {
 					$max_value = $filter_params['max_value'];
 				}
 				else {
 					$max_sql = str_replace('COUNT(*) AS count', 'MAX(' . $field_sql . ')', $sql);
 					$max_value = $this->Conn->GetOne($max_sql);
 				}
 
 				if ( !$max_value ) {
 					return '';
 				}
 
 				$range_start = 0;
 				$range_count = $object->GetDBField('RangeCount');
 				$max_value = $this->getClosestValue($max_value / $range_count) * $range_count;
 
 				if ( $max_value <= $range_count ) {
 					$range_count = floor($range_count / 2);
 				}
 
 				$range_size = $max_value / $range_count;
 
 //				$range_size = ceil( $max_value / $range_count );
 //				$max_value = $range_size * $range_count; // to compensate diff, created by "ceil" function usage
 
 				$options = Array ();
 				$count_clause = '';
 				$if_clause_mask = 'IF(%s BETWEEN %s AND %s, %s, %%s)';
 
 				for ($range_number = 0; $range_number < $range_count; $range_number++) {
 					$range_end = $range_start + $range_size;
 					$option_key = sprintf('%01.2f', $range_start) . '-' . sprintf('%01.2f', $range_end);
 					$options[$option_key] = $this->applyFormatting($range_start, $params);
 
 					$sql_part = sprintf($if_clause_mask, $field_sql, $range_start, $range_end, $this->Conn->qstr($option_key));
 					$count_clause = $count_clause ? sprintf($count_clause, $sql_part) : $sql_part;
 					$range_start = $range_end;
 				}
 
 				$options[sprintf('%01.2f', $range_start) . '-' . sprintf('%01.2f', $range_start)] = $this->applyFormatting($range_start, $params);
 
 				$cache[$cache_key]['max_value'] = $max_value;
 				$cache[$cache_key]['options'] = $options;
 
 				$count_clause = sprintf($count_clause, $this->Conn->qstr($option_key));
 				$count_sql = str_replace('COUNT(*) AS count', 'COUNT(*), ' . $count_clause . ' AS GroupField', $sql) . ' GROUP BY GroupField';
 				$cache[$cache_key]['counts'] = $this->Conn->GetCol($count_sql, 'GroupField');
 			}
 		}
 
 		$options = $cache[$cache_key]['options'];
 		$counts = $cache[$cache_key]['counts'];
 
 		if ( !$options || array_sum($counts) == 0 ) {
 			// no options in the filter OR no records to operate on
 			return '';
 		}
 
 		if ( $filter_type != 'range' ) {
 			$counts[''] = array_sum($counts);
 			$options = kUtil::array_merge_recursive(Array ('' => 'All'), $options);
 		}
 
 		$ret = '';
 		$block_params = $this->prepareTagParams($params);
 		$block_params['name'] = $params['render_as'];
 		$selected_value = $this->getFilterValue($filter_field);
 
 		if ( $filter_type == 'range' && $params['type'] == 'count' ) {
 			// don't display last count, that corresponds to fake option
 			array_pop($options);
 		}
 
 		$last_option_title = end($options);
 
 		foreach ($options as $option_key => $option_title) {
 			$block_params['key'] = $option_key;
 			$block_params['title'] = $option_title;
 			$block_params['count'] = isset($counts[$option_key]) ? $counts[$option_key] : 0;
 			$block_params['is_last'] = $option_title == $last_option_title;
 
 			if ( strpos($selected_value, '|') === false ) {
 				$block_params['selected'] = "$selected_value" === "$option_key";
 			}
 			else {
 				$block_params['selected'] = strpos($selected_value, '|' . $option_key . '|') !== false;
 			}
 
 			$ret .= $this->Application->ParseBlock($block_params);
 		}
 
 		// set global vars to be used by jQuery UI slider
 		if ( $filter_type == 'range' ) {
 			$max_value = $cache[$cache_key]['max_value'];
 
 			$this->Application->SetVar('min_range_value', 0);
 			$this->Application->SetVar('max_range_value', $max_value);
 
 			$range_count = $object->GetDBField('RangeCount');
 
 			if ( $max_value <= $range_count ) {
 				$range_count = floor($range_count / 2);
 			}
 
 			$range_size = $max_value / $range_count;
 			$this->Application->SetVar('range_step', $range_size);
 
 //			$this->Application->SetVar('range_step', 1);
 
 			if ( $selected_value ) {
 				list ($from_selected_value, $to_selected_value) = explode('-', $selected_value);
 
 				$this->Application->SetVar('selected_from_range', $from_selected_value);
 				$this->Application->SetVar('selected_to_range', $to_selected_value);
 			}
 			else {
 				$this->Application->SetVar('selected_from_range', 0);
 				$this->Application->SetVar('selected_to_range', $max_value);
 			}
 		}
 
 		if ( $ret ) {
 			$this->Application->Parser->DataExists = true;
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Formats value to display in filter
 	 *
 	 * @param mixed $value
 	 * @param Array $params
 	 * @return string
 	 */
 	function applyFormatting($value, $params)
 	{
 		if ( isset($params['currency']) && $params['currency']) {
 			$iso = $this->GetISO($params['currency']);
 			$value = $this->ConvertCurrency($value, $iso);
 
 			$decimal_tag = isset($params['decimal_tag']) ? $params['decimal_tag'] : '';
 			$value = $this->AddCurrencySymbol($value, $iso, $decimal_tag);
 		}
 
 		return $value;
 	}
 
 	/**
 	 * Returns next closest value to given one
 	 *
 	 * @param float $value
 	 * @return int
 	 * @access protected
 	 */
 	protected function getClosestValue($value)
 	{
 		$scale = Array (0, 1, 2, 5, 10, 20, 25, 30, 40, 50, 100, 150, 200, 250, 300, 400, 500, 1000, 1500, 2000, 2500, 3000, 5000, 10000);
 
 		foreach ($scale as $scale_value) {
 			if ( $scale_value >= $value ) {
 				return $scale_value;
 			}
 		}
 
 		return end($scale);
 	}
 
 	/**
 	 * Filter input name
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function FilterInputName($params)
 	{
 		$field = $this->Application->Parser->GetParam('filter_field');
 
 		$ret = 'filters[' . $field . ']';
 
 		if (array_key_exists('as_preg', $params) && $params['as_preg']) {
 			$ret = preg_quote($ret, '/');
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Returns filter value
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function FilterField($params)
 	{
 		$field = $this->Application->Parser->GetParam('filter_field');
 
 		return $this->getFilterValue($field);
 	}
 
 	/**
 	 * Returns filter value
 	 *
 	 * @param string $field
 	 * @return string
 	 * @access protected
 	 */
 	protected function getFilterValue($field)
 	{
 		$filters = $this->Application->GetVar('filters', Array ());
 
 		return array_key_exists($field, $filters) ? $filters[$field] : '';
 	}
 
 	/**
 	 * Returns calculated range slider height
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function SliderHeight($params)
 	{
 		// range count could be dynamically changed in PrintFilterOptions tag
 		$max_value = $this->Application->GetVar('max_range_value');
 
 		if ( $max_value !== false ) {
 			$range_count = $max_value / $this->Application->GetVar('range_step');
 		}
 		else {
+			/** @var kDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBItem */
 
 			$range_count = $object->GetDBField('RangeCount');
 		}
 
 		return $range_count * $params['factor'];
 	}
 }
Index: branches/5.3.x/core/units/modules/modules_tag_processor.php
===================================================================
--- branches/5.3.x/core/units/modules/modules_tag_processor.php	(revision 16518)
+++ branches/5.3.x/core/units/modules/modules_tag_processor.php	(revision 16519)
@@ -1,117 +1,117 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class ModulesTagProcessor extends kDBTagProcessor  {
 
 		function ModuleInstalled($params)
 		{
 			return $this->Application->isModuleEnabled($params['name']);
 		}
 
 		function _hasPrivileges()
 		{
 			return $this->Application->RecallVar('user_id') == USER_ROOT;
 		}
 
 		function AlreadyInstalled($params)
 		{
 			if (!$this->_hasPrivileges()) {
 				// don't show licenses status for non-privileged users
 				return true;
 			}
 
+			/** @var kDBList $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBList */
 
+			/** @var kModulesHelper $modules_helper */
 			$modules_helper = $this->Application->recallObject('kModulesHelper');
-			/* @var $modules_helper kModulesHelper */
 
 			return $modules_helper->moduleInstalled( $object->GetDBField('Name') );
 		}
 
 		function ModuleLicensed($params)
 		{
 			if (!$this->_hasPrivileges()) {
 				// don't show licenses status for non-privileged users
 				return true;
 			}
 
+			/** @var kDBList $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBList */
 
+			/** @var kModulesHelper $modules_helper */
 			$modules_helper = $this->Application->recallObject('kModulesHelper');
-			/* @var $modules_helper kModulesHelper */
 
 			$licensed_modules = array_map('strtolower', $modules_helper->_GetModules());
 
 			return in_array(strtolower($object->GetDBField('Name')), $licensed_modules);
 		}
 
 		function PrerequisitesMet($params)
 		{
 			return !$this->_getPrerequisitesErrors($params);
 		}
 
 		function _getPrerequisitesErrors($params)
 		{
 			static $errors = Array ();
 
+			/** @var kDBList $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBList */
 
 			$module_path = $object->GetDBField('Path');
 
 			if (!array_key_exists($module_path, $errors)) {
 				require_once FULL_PATH . '/core/install/install_toolkit.php';
 
 				$toolkit = new kInstallToolkit();
 
 				$module_version = $toolkit->GetMaxModuleVersion($module_path);
 
 				$errors[$module_path] = $toolkit->CheckPrerequisites($module_path, Array ($module_version), 'standalone');
 			}
 
 			return $errors[$module_path];
 		}
 
 		function ListPrerequisites($params)
 		{
 			$errors = $this->_getPrerequisitesErrors($params);
 
 			$ret = '';
 			$block_params = $this->prepareTagParams($params);
 			$block_params['name'] = $params['render_as'];
 
 			foreach ($errors as $error) {
 				$block_params['error'] = $error;
 				$ret .= $this->Application->ParseBlock($block_params);
 			}
 
 			return $ret;
 		}
 
 		function InstallLink($params)
 		{
+			/** @var kDBList $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBList */
 
 			$module_path = strtolower( $object->GetDBField('Path') );
 			$url_params = Array ('redirect' => 1, 'admin' => 1);
 
 			return $this->Application->HREF('dummy', '_FRONT_END_', $url_params, $module_path . 'install.php');
 		}
 
 	}
Index: branches/5.3.x/core/units/modules/modules_event_handler.php
===================================================================
--- branches/5.3.x/core/units/modules/modules_event_handler.php	(revision 16518)
+++ branches/5.3.x/core/units/modules/modules_event_handler.php	(revision 16519)
@@ -1,177 +1,177 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class ModulesEventHandler extends kDBEventHandler {
 
 		/**
 		 * Builds item (loads if needed)
 		 *
 		 * Pattern: Prototype Manager
 		 *
 		 * @param kEvent $event
 		 * @access protected
 		 */
 		protected function OnItemBuild(kEvent $event)
 		{
 			$this->Application->SetVar($event->getPrefixSpecial(true) . '_id', $event->Special);
 
 			parent::OnItemBuild($event);
 		}
 
 		/**
 		 * Apply any custom changes to list's sql query
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
 		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			if ( $event->Special ) {
 				$object->addFilter('current_module', '%1$s.Name = ' . $event->Special);
 			}
 
 			$object->addFilter('not_core', '%1$s.Name <> "Core"');
 		}
 
 		/**
 		 * Define alternative event processing method names
 		 *
 		 * @return void
 		 * @see kEventHandler::$eventMethods
 		 * @access protected
 		 */
 		protected function mapEvents()
 		{
 			parent::mapEvents();
 
 			$this->eventMethods['OnMassApprove'] = 'moduleAction';
 			$this->eventMethods['OnMassDecline'] = 'moduleAction';
 		}
 
 		/**
 		 * Disabled modules, but not In-Portal
 		 *
 		 * @param kEvent $event
 		 */
 		function moduleAction($event)
 		{
 			if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
 				$event->status = kEvent::erFAIL;
 				return ;
 			}
 
+			/** @var kDBItem $object */
 			$object = $event->getObject( Array('skip_autoload' => true) );
-			/* @var $object kDBItem */
 
 			$ids = $this->StoreSelectedIDs($event);
 
 			if (!$ids) {
 				return ;
 			}
 
 			$updated = 0;
 			$status_field = $event->getUnitConfig()->getStatusField(true);
 
 			foreach ($ids as $id) {
 				$object->Load($id);
 
 				if (in_array($id, Array ('In-Portal', 'Core')) || !$object->isLoaded()) {
 					// don't allow any kind of manupulations with kernel
 					// approve/decline on not installed module
 					continue;
 				}
 
 				$enabled = $event->Name == 'OnMassApprove' ? 1 : 0;
 				$object->SetDBField($status_field, $enabled);
 
 				if (!$object->GetChangedFields()) {
 					// no changes -> skip
 					continue;
 				}
 
 				if ($object->Update()) {
 					$updated++;
 
 					$sql = 'UPDATE ' . TABLE_PREFIX . 'ImportScripts
 							SET Status = ' . $enabled . '
  							WHERE Module = "' . $object->GetDBField('Name') . '"';
  					$this->Conn->Query($sql);
 				}
 				else {
 					$event->status = kEvent::erFAIL;
 					$event->redirect = false;
 					break;
 				}
 			}
 
 			if ( $updated ) {
 				$event->status = kEvent::erSUCCESS;
 				$event->SetRedirectParam('opener', 's');
 
 				$this->Application->DeleteUnitCache();
 				$this->Application->DeleteSectionCache();
 
 				$event->SetRedirectParam('RefreshTree', 1);
 			}
 		}
 
 		/**
 		 * Occurs after list is queried
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterListQuery(kEvent $event)
 		{
 			parent::OnAfterListQuery($event);
 
+			/** @var kModulesHelper $modules_helper */
 			$modules_helper = $this->Application->recallObject('kModulesHelper');
-			/* @var $modules_helper kModulesHelper */
 
 			$new_modules = $modules_helper->getModules(kModulesHelper::NOT_INSTALLED);
 
 			if ( !$new_modules || $this->Application->RecallVar('user_id') != USER_ROOT ) {
 				return;
 			}
 
 			require_once FULL_PATH . '/core/install/install_toolkit.php';
 
 			$toolkit = new kInstallToolkit();
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			foreach ($new_modules as $module) {
 				$module_record = Array (
 					'Name' => $toolkit->getModuleName($module),
 					'Path' => 'modules/' . $module . '/',
 					'Version' => $toolkit->GetMaxModuleVersion('modules/' . $module . '/'),
 					'Loaded' => 0,
 					'BuildDate' => null,
 				);
 
 				$object->addRecord($module_record);
 			}
 		}
 	}
Index: branches/5.3.x/core/units/content/content_tp.php
===================================================================
--- branches/5.3.x/core/units/content/content_tp.php	(revision 16518)
+++ branches/5.3.x/core/units/content/content_tp.php	(revision 16519)
@@ -1,53 +1,53 @@
 <?php
 /**
  * @version	$Id$
  * @package	In-Portal
  * @copyright	Copyright (C) 1997 - 2012 Intechnic. All rights reserved.
  * @license	  GNU/GPL
  * In-Portal is Open Source software.
  * This means that this software may have been modified pursuant
  * the GNU General Public License, and as distributed it includes
  * or is derivative of works licensed under the GNU General Public License
  * or other free or open source software licenses.
  * See http://www.in-portal.org/license for copyright notices and details.
  */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class ContentTagProcessor extends kDBTagProcessor {
 
 	/**
 	 * Creates a button for editing item in Admin Console
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function AdminEditButton($params)
 	{
 		if ( EDITING_MODE != EDITING_MODE_CONTENT ) {
 			return '';
 		}
 
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		$params['pass'] = 'm,c,content';
 		$params['c_id'] = $object->GetDBField('PageId');
 		$params['admin'] = 1;
 
 		$params['temp_mode'] = 0;
 		$params['template'] = 'categories/edit_content';
 		$params['button_icon'] = 'content_mode.png';
 		$params['button_class'] = 'cms-edit-btn';
 		$params['button_title'] = '+' . $this->Application->Phrase('la_btn_EditContent', false, true);
 
 		if ( defined('DEBUG_MODE') && DEBUG_MODE ) {
 			$params['button_title'] .= ' - #' . $params['num'];
 		}
 
 		unset($params['num']);
 
 		return parent::AdminEditButton($params);
 	}
 }
\ No newline at end of file
Index: branches/5.3.x/core/units/content/content_eh.php
===================================================================
--- branches/5.3.x/core/units/content/content_eh.php	(revision 16518)
+++ branches/5.3.x/core/units/content/content_eh.php	(revision 16519)
@@ -1,274 +1,274 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class ContentEventHandler extends kDBEventHandler {
 
 		/**
 		 * Checks user permission to execute given $event
 		 *
 		 * @param kEvent $event
 		 * @return bool
 		 * @access public
 		 */
 		public function CheckPermission(kEvent $event)
 		{
+			/** @var kPermissionsHelper $perm_helper */
 			$perm_helper = $this->Application->recallObject('PermissionsHelper');
-			/* @var $perm_helper kPermissionsHelper */
 
 			$user_id = $this->Application->RecallVar('user_id');
 
 			// user can change top category
 			$top_category = $this->Application->getBaseCategory();
 			$perm_status = $perm_helper->CheckUserPermission($user_id, 'CATEGORY.MODIFY', 0, $top_category);
 
 			return $perm_helper->finalizePermissionCheck($event, $perm_status);
 		}
 
 		/**
 		 * Saves changes to a content block (+ creates draft if missing)
 		 *
 		 * @param kEvent $event
 		 */
 		function OnSaveContentBlock($event)
 		{
 			if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
 				$event->status = kEvent::erFAIL;
 
 				return;
 			}
 
 			$updated = $this->saveContentBlock($event, false);
 
 			if ( $this->Application->GetVar('ajax') == 'yes' ) {
 				$event->status = kEvent::erSTOP;
 				echo ($updated === false) ? 'FAILED' : 'OK';
 			}
 			elseif ( !$updated ) {
 				$event->status = kEvent::erFAIL;
 			}
 
 			$event->SetRedirectParam('opener', 'u');
 		}
 
 		/**
 		 * Prepare temp tables and populate it
 		 * with items selected in the grid
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnEdit(kEvent $event)
 		{
 			parent::OnEdit($event);
 
+			/** @var fckFCKHelper $fck_helper */
 			$fck_helper = $this->Application->recallObject('FCKHelper');
-			/* @var $fck_helper fckFCKHelper */
 
 			$transit_params = $fck_helper->getTransitParams();
 
 			foreach ($transit_params as $param_name => $param_value) {
 				$event->SetRedirectParam($param_name, $param_value);
 			}
 		}
 
 		/**
 		 * Saves changes & changes language
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnPreSaveAndChangeLanguage(kEvent $event)
 		{
 			if ( $this->UseTempTables($event) ) {
 				parent::OnPreSaveAndChangeLanguage($event);
 
 				return;
 			}
 
 			// CUSTOM: begin
 			$event->CallSubEvent('OnSaveContentBlock');
 			$event->SetRedirectParam('opener', 's');
 			// CUSTOM: end
 
 			if ( $event->status == kEvent::erSUCCESS ) {
 				$this->Application->SetVar('m_lang', $this->Application->GetVar('language'));
 
 				$data = $this->Application->GetVar('st_id');
 
 				if ( $data ) {
 					$event->SetRedirectParam('st_id', $data);
 				}
 			}
 		}
 		/**
 		 * Performs auto-save of current content block (will create draft too)
 		 *
 		 * @param kEvent $event
 		 */
 		function OnAutoSave($event)
 		{
 			$event->status = kEvent::erSTOP;
 
 			if ( $this->Application->GetVar('ajax') != 'yes' ) {
 				return ;
 			}
 
 			echo $this->saveContentBlock($event, true);
 		}
 
 		/**
 		 * Saves content block
 		 *
 		 * @param kEvent $event
 		 * @param bool $is_draft
 		 * @return string
 		 */
 		function saveContentBlock($event, $is_draft)
 		{
 			$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
 
 			if ( !$items_info ) {
 				return '';
 			}
 
 			list ($object, $revision) = $this->getContentBlockAndRevision($event);
-			/* @var $revision kDBItem */
-			/* @var $object kDBItem */
+			/** @var kDBItem $revision */
+			/** @var kDBItem $object */
 
 			list (, $field_values) = each($items_info);
 			$object->SetFieldsFromHash($field_values);
 			$event->setEventParam('form_data', $field_values);
 			$updated = $object->Update();
 
 			if ( $updated ) {
 				$revision->SetDBField('AutoSavedOn_date', time());
 				$revision->SetDBField('AutoSavedOn_time', time());
 				$revision->Update();
 			}
 
 			if ( $is_draft ) {
 				if ( $updated ) {
+					/** @var PageHelper $page_helper */
 					$page_helper = $this->Application->recallObject('PageHelper');
-					/* @var $page_helper PageHelper */
 
 					return $revision->GetField('AutoSavedOn') . ' (' . $page_helper->getAgoTime($revision->GetDBField('AutoSavedOn')) . ')';
 				}
 			}
 			else {
 				return $updated;
 			}
 
 			return '';
 		}
 
 		/**
 		 * Returns last autosave time
 		 *
 		 * @param kEvent $event
 		 */
 		function OnGetAutoSaveTime($event)
 		{
 			$event->status = kEvent::erSTOP;
 
 			if ( $this->Application->GetVar('ajax') != 'yes' ) {
 				return;
 			}
 
 			list (, $revision) = $this->getContentBlockAndRevision($event);
-			/* @var $revision kDBItem */
+			/** @var kDBItem $revision */
 
+			/** @var PageHelper $page_helper */
 			$page_helper = $this->Application->recallObject('PageHelper');
-			/* @var $page_helper PageHelper */
 
 			$time = $revision->GetField('AutoSavedOn');
 
 			if ( $time ) {
 				echo $time . ' (' . $page_helper->getAgoTime($revision->GetDBField('AutoSavedOn')) . ')';
 			}
 		}
 
 		/**
 		 * Loads content block from given revision
 		 *
 		 * @param kDBItem $object
 		 * @param kDBItem $revision
 		 */
 		function loadFromRevision(&$object, &$revision)
 		{
 			$load_keys = Array(
 				'PageId' => $object->GetDBField('PageId'),
 				'ContentNum' => $object->GetDBField('ContentNum'),
 				'RevisionId' => $revision->GetID(),
 			);
 
 			$object->Load($load_keys);
 		}
 
 		/**
 		 * Returns content block.
 		 *
 		 * @param kEvent $event
 		 *
 		 * @return kDBItem[]
 		 */
 		function getContentBlockAndRevision(kEvent $event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject(Array('skip_autoload' => true));
-			/* @var $object kDBItem */
 
 			$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
 			if ( !$items_info ) {
 				return array();
 			}
 
 			list ($id,) = each($items_info);
 			$object->Load($id);
 
+			/** @var kDBItem $revision */
 			$revision = $this->Application->recallObject('page-revision', null, Array('skip_autoload' => true));
-			/* @var $revision kDBItem */
 
 			$revision->Load($object->GetDBField('RevisionId'));
 
 			if ( $this->Application->ConfigValue('EnablePageContentRevisionControl') && !$revision->GetDBField('IsDraft') ) {
 				// editing live revision of a page's content block -> get draft for current user and page
 				$load_keys = Array(
 					'PageId' => $revision->GetDBField('PageId'),
 					'IsDraft' => 1,
 					'CreatedById' => $this->Application->RecallVar('user_id'),
 				);
 
 				$revision->Load($load_keys);
 
 				if ( $revision->isLoaded() ) {
 					// draft found -> use draft's content block version
 					$this->loadFromRevision($object, $revision);
 				}
 				else {
 					// draft not found -> create new
 					$revision->SetDBFieldsFromHash($load_keys);
 					$revision->SetDBField('FromRevisionId', $object->GetDBField('RevisionId'));
 
 					if ( $revision->Create() ) {
 						$this->loadFromRevision($object, $revision);
 					}
 				}
 			}
 
 			return Array(&$object, &$revision);
 		}
 	}
Index: branches/5.3.x/core/units/permission_types/permission_type_eh.php
===================================================================
--- branches/5.3.x/core/units/permission_types/permission_type_eh.php	(revision 16518)
+++ branches/5.3.x/core/units/permission_types/permission_type_eh.php	(revision 16519)
@@ -1,42 +1,42 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class PermissionTypeEventHandler extends kDBEventHandler {
 
 	/**
 	 * Cant delete system permissions
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnBeforeItemDelete(kEvent $event)
 	{
 		parent::OnBeforeItemDelete($event);
 
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		if ( $object->GetDBField('IsSystem') ) {
 			// prevents deletion of this permission
 			$event->status = kEvent::erFAIL;
 
 			// informs main event, that redirect shouldn't be made
 			$event->MasterEvent->status = kEvent::erFAIL;
 			$this->Application->SetVar('cant_delete_system_permission', 1);
 		}
 	}
 }
Index: branches/5.3.x/core/units/system_event_subscriptions/system_event_subscription_tp.php
===================================================================
--- branches/5.3.x/core/units/system_event_subscriptions/system_event_subscription_tp.php	(revision 16518)
+++ branches/5.3.x/core/units/system_event_subscriptions/system_event_subscription_tp.php	(revision 16519)
@@ -1,262 +1,262 @@
 <?php
 /**
  * @version	$Id$
  * @package	In-Portal
  * @copyright	Copyright (C) 1997 - 2012 Intechnic. All rights reserved.
  * @license	  GNU/GPL
  * In-Portal is Open Source software.
  * This means that this software may have been modified pursuant
  * the GNU General Public License, and as distributed it includes
  * or is derivative of works licensed under the GNU General Public License
  * or other free or open source software licenses.
  * See http://www.in-portal.org/license for copyright notices and details.
  */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class SystemEventSubscriptionTagProcessor extends kDBTagProcessor {
 
 	/**
 	 * Holds reference to subscription analyzer
 	 *
 	 * @var kSubscriptionAnalyzer
 	 */
 	protected $_analyzer = null;
 
 	/**
 	 * Allows to show category path of selected module
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function CategoryPath($params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		$category_id = $object->GetDBField('CategoryId');
 
 		if ( !is_numeric($category_id) ) {
 			return '';
 		}
 
 		$params['cat_id'] = $category_id;
 
+		/** @var kNavigationBar $navigation_bar */
 		$navigation_bar = $this->Application->recallObject('kNavigationBar');
-		/* @var $navigation_bar kNavigationBar */
 
 		return $navigation_bar->build($params);
 	}
 
 	/**
 	 * Prints item name
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function ItemName($params)
 	{
+		/** @var kDBList $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBList */
 
 		if ( !isset($this->_analyzer) ) {
 			$this->_analyzer = new kSubscriptionAnalyzer($object);
 			$this->_analyzer->run();
 		}
 
 		return $this->_analyzer->getTitle($this->SelectParam($params, 'name,field'));
 	}
 }
 
 
 class kSubscriptionAnalyzer extends kBase {
 
 	/**
 	 * Reference to a list object
 	 *
 	 * @var kDBList
 	 * @access protected
 	 */
 	protected $_subscriptions = null;
 
 	/**
 	 * Remember what to what ids subscription exists for each of subscribed prefixes
 	 *
 	 * @var Array
 	 * @access protected
 	 */
 	protected $_prefixToIdsMap = Array ();
 
 	/**
 	 * Reverse index that remembers what prefix is used in what row (fields: ItemId, ParentItemId)
 	 *
 	 * @var Array
 	 * @access protected
 	 */
 	protected $_prefixToRowMap = Array ();
 
 	/**
 	 * Holds title of each item in list in format [prefix][id] = title
 	 *
 	 * @var Array
 	 * @access protected
 	 */
 	protected $_itemTitles = Array ();
 
 	/**
 	 * Set's references to kApplication and DBConnection interface class instances
 	 *
 	 * @param kDBList $subscriptions
 	 * @access public
 	 * @see kApplication
 	 * @see IDBConnection
 	 */
 	public function __construct($subscriptions)
 	{
 		parent::__construct();
 
 		$this->_subscriptions = $subscriptions;
 	}
 
 	/**
 	 * Analyzes list
 	 *
 	 * @return void
 	 * @access public
 	 */
 	public function run()
 	{
 		foreach ($this->_subscriptions as $subscription) {
 			$prefix = $this->_getPrefix();
 			$parent_prefix = $this->Application->getUnitConfig($prefix)->getParentPrefix();
 
 			$this->_addIdToPrefix($prefix, 'ItemId');
 			$this->_addIdToPrefix($parent_prefix, 'ParentItemId');
 		}
 
 		$this->_queryItemTitles();
 		$this->_subscriptions->GoFirst();
 	}
 
 	/**
 	 * Returns item title, associated with item's ID in given field
 	 *
 	 * @param string $field
 	 * @return string
 	 */
 	public function getTitle($field)
 	{
 		$row_index = $this->_subscriptions->key();
 
 		if ( !isset($this->_prefixToRowMap[$row_index][$field]) ) {
 			return '';
 		}
 
 		$prefix = $this->_prefixToRowMap[$row_index][$field];
 		$value = $this->_subscriptions->GetDBField($field);
 
 		return $this->_itemTitles[$prefix][$value];
 	}
 
 	/**
 	 * Queries titles for each of subscribed items
 	 *
 	 * @return void
 	 * @access protected
 	 */
 	protected function _queryItemTitles()
 	{
 		foreach ($this->_prefixToIdsMap as $prefix => $ids) {
 			$config = $this->Application->getUnitConfig($prefix);
 			$id_field = $config->getIDField();
 
 			$sql = 'SELECT ' . $this->_getTitleField($prefix) . ', ' . $id_field . '
 					FROM ' . $config->getTableName() . '
 					WHERE ' . $id_field . ' IN (' . implode(',', $ids) . ')';
 			$this->_itemTitles[$prefix] = $this->Conn->GetCol($sql, $id_field);
 		}
 	}
 
 	/**
 	 * Adds ID from a gvein field (when it isn't NULL) to prefix ids
 	 *
 	 * @param string $prefix
 	 * @param string $field
 	 * @return void
 	 * @access protected
 	 */
 	protected function _addIdToPrefix($prefix, $field)
 	{
 		$id = $this->_subscriptions->GetDBField($field);
 
 		if ( !$id || !$prefix ) {
 			return;
 		}
 
 		// add id to prefix ids list
 		if ( !isset($this->_prefixToIdsMap[$prefix]) ) {
 			$this->_prefixToIdsMap[$prefix] = Array ();
 		}
 
 		if ( !in_array($id, $this->_prefixToIdsMap[$prefix]) ) {
 			$this->_prefixToIdsMap[$prefix][] = $id;
 		}
 
 		// remeber prefix associated with this field
 		$row_index = $this->_subscriptions->key();
 
 		if ( !isset($this->_prefixToRowMap[$row_index]) ) {
 			$this->_prefixToRowMap[$row_index] = Array ();
 		}
 
 		$this->_prefixToRowMap[$row_index][$field] = $prefix;
 	}
 
 	/**
 	 * Returns prefix of main item in current row
 	 *
 	 * @return string
 	 * @access protected
 	 * @throws Exception
 	 */
 	protected function _getPrefix()
 	{
 		$event = new kEvent($this->_subscriptions->GetDBField('BindToSystemEvent'));
 
 		if ( !$event->Prefix ) {
 			throw new Exception('Subscription "<strong>#' . $this->_subscriptions->GetID() . '</strong>" is connected to invalid or missing e-mail template "<strong>#' . $this->_subscriptions->GetDBField('EmailTemplateId') . '</strong>"');
 		}
 
 		return $event->Prefix;
 	}
 
 	/**
 	 * Returns title field of given prefix
 	 *
 	 * @param string $prefix
 	 * @return array
 	 */
 	protected function _getTitleField($prefix)
 	{
 		$lang_prefix = '';
 		$config = $this->Application->getUnitConfig($prefix);
 		$title_field = $config->getTitleField();
 
 		if ( preg_match('/^(l[\d]+_)(.*)/', $title_field, $regs) ) {
 			// object was initialized and we have lang prefix in unit config
 			$lang_prefix = $regs[1];
 			$title_field = $regs[2];
 		}
 		else {
 			// object wasn't initialized -> check other way OR not ml title field
 			$field_options = $config->getFieldByName($title_field);
 
 			if ( isset($field_options['formatter']) && $field_options['formatter'] == 'kMultiLanguage' ) {
 				$lang_prefix = 'l' . $this->Application->GetVar('m_lang') . '_';
 			}
 		}
 
 		return $lang_prefix . $title_field;
 	}
 }
\ No newline at end of file
Index: branches/5.3.x/core/units/system_event_subscriptions/system_event_subscription_eh.php
===================================================================
--- branches/5.3.x/core/units/system_event_subscriptions/system_event_subscription_eh.php	(revision 16518)
+++ branches/5.3.x/core/units/system_event_subscriptions/system_event_subscription_eh.php	(revision 16519)
@@ -1,102 +1,102 @@
 <?php
 /**
  * @version	$Id$
  * @package	In-Portal
  * @copyright	Copyright (C) 1997 - 2012 Intechnic. All rights reserved.
  * @license	  GNU/GPL
  * In-Portal is Open Source software.
  * This means that this software may have been modified pursuant
  * the GNU General Public License, and as distributed it includes
  * or is derivative of works licensed under the GNU General Public License
  * or other free or open source software licenses.
  * See http://www.in-portal.org/license for copyright notices and details.
  */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class SystemEventSubscriptionEventHandler extends kDBEventHandler {
 
 	/**
 	 * Makes either user or e-mail required
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnAfterItemLoad(kEvent $event)
 	{
 		parent::OnAfterItemLoad($event);
 
 		$this->_setRequired($event);
 	}
 
 	/**
 	 * Makes either user or e-mail required
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnPreCreate(kEvent $event)
 	{
 		parent::OnPreCreate($event);
 
 		$this->_setRequired($event);
 	}
 
 	/**
 	 * Makes either user or e-mail required
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnBeforeItemCreate(kEvent $event)
 	{
 		parent::OnBeforeItemCreate($event);
 
 		$this->_itemChanged($event);
 	}
 
 	/**
 	 * Makes either user or e-mail required
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnBeforeItemUpdate(kEvent $event)
 	{
 		parent::OnBeforeItemUpdate($event);
 
 		$this->_itemChanged($event);
 	}
 
 	/**
 	 * Makes either user or e-mail required
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function _itemChanged(kEvent $event)
 	{
 		$this->_setRequired($event);
 	}
 
 	/**
 	 * Makes either user or e-mail required
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function _setRequired(kEvent $event)
 	{
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		$object->setRequired('UserId', !$object->GetDBField('SubscriberEmail'));
 		$object->setRequired('SubscriberEmail', !$object->GetDBField('UserId'));
 	}
 }
\ No newline at end of file
Index: branches/5.3.x/core/units/category_items/category_items_event_handler.php
===================================================================
--- branches/5.3.x/core/units/category_items/category_items_event_handler.php	(revision 16518)
+++ branches/5.3.x/core/units/category_items/category_items_event_handler.php	(revision 16519)
@@ -1,135 +1,136 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class CategoryItemsEventHandler extends kDBEventHandler
 	{
 		/**
 		 * Setting language dependant navigation bar as calculated field
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
 		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
+			/** @var kMultiLanguage $ml_formatter */
 			$ml_formatter = $this->Application->recallObject('kMultiLanguage');
-			/* @var $ml_formatter kMultiLanguage */
 
 			$object->addCalculatedField('CategoryName', 'c.' . $ml_formatter->LangFieldName('CachedNavbar'));
 		}
 
 		/**
 		 * Set's new category as primary for product
 		 *
 		 * @param kEvent $event
 		 */
 		function OnSetPrimary($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject(Array ('skip_autoload' => true));
-			/* @var $object kDBItem */
 
 			$ids = $this->StoreSelectedIDs($event);
 
 			if ( $ids ) {
 				$id = array_shift($ids);
 				$table_info = $object->getLinkedInfo();
 
 				$this->Conn->Query('UPDATE ' . $object->TableName . ' SET PrimaryCat = 0 WHERE ' . $table_info['ForeignKey'] . ' = ' . $table_info['ParentId']);
 				$this->Conn->Query('UPDATE ' . $object->TableName . ' SET PrimaryCat = 1 WHERE (' . $table_info['ForeignKey'] . ' = ' . $table_info['ParentId'] . ') AND (Id = ' . $id . ')');
 			}
 
 			$event->SetRedirectParam('opener', 's');
 		}
 
 		/**
 		 * Removes primary mark from cloned category items record
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterClone(kEvent $event)
 		{
 			parent::OnAfterClone($event);
 
 			$config = $event->getUnitConfig();
 
 			$sql = 'UPDATE ' . $config->getTableName() . '
 					SET PrimaryCat = 0
 					WHERE ' . $config->getIDField() . ' = ' . $event->getEventParam('id');
 			$this->Conn->Query($sql);
 		}
 
 		/**
 		 * Deletes items of requested type from requested categories.
 		 * In case if item is deleted from it's last category, then delete item too.
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnDeleteFromCategory($event)
 		{
 			$category_ids = $event->getEventParam('category_ids');
 
 			if ( !$category_ids ) {
 				return ;
 			}
 
 			$item_prefix = $event->getEventParam('item_prefix');
+
+			/** @var kCatDBItem $item */
 			$item = $this->Application->recallObject($item_prefix . '.-item', null, Array ('skip_autoload' => true));
-			/* @var $item kCatDBItem */
 
 			$ci_table = $event->getUnitConfig()->getTableName();
 			$item_table = $this->Application->getUnitConfig($item_prefix)->getTableName();
 
 			$sql = 'SELECT ItemResourceId, CategoryId
 					FROM %1$s
 					INNER JOIN %2$s ON (%1$s.ResourceId = %2$s.ItemResourceId)
 					WHERE CategoryId IN (%3$s)';
 			$category_items = $this->Conn->Query( sprintf($sql, $item_table, $ci_table, implode(',', $category_ids)) );
 
 			$item_hash = Array ();
 			foreach ($category_items as $ci_row) {
 				$item_hash[ $ci_row['ItemResourceId'] ][] = $ci_row['CategoryId'];
 			}
 
 			foreach ($item_hash as $item_resource_id => $delete_category_ids) {
 				$item->Load($item_resource_id, 'ResourceId');
 				$item->DeleteFromCategories($delete_category_ids);
 			}
 		}
 
 		/**
 		 * Makes sure, that parent category item is loaded when coping back from temp table
 		 *
 		 * @param kEvent $event
 		 *
 		 * @return void
 		 * @see    CategoryItems_DBItem::GetKeyClause()
 		 */
 		protected function OnAfterCopyToLive(kEvent $event)
 		{
 			// don't call parent, because it's unclear how from here we can get parent item's ID here
 		}
 
 	}
\ No newline at end of file
Index: branches/5.3.x/core/units/category_items/category_items_tag_processor.php
===================================================================
--- branches/5.3.x/core/units/category_items/category_items_tag_processor.php	(revision 16518)
+++ branches/5.3.x/core/units/category_items/category_items_tag_processor.php	(revision 16519)
@@ -1,46 +1,46 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class CategoryItemsTagProcessor extends kDBTagProcessor
 	{
 		function CategoryName($params)
 		{
 			$field = $this->SelectParam($params, 'name,field');
 
+			/** @var kDBList $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBList */
 
 			$root_phrase = $this->Application->Phrase(($this->Application->isAdmin ? 'la_' : 'lu_') . 'rootcategory_name');
 			$cached_navbar = preg_replace('/^(Content&\|&|Content)/i', '', $object->GetDBField($field));
 			$value = str_replace('&|&', ' > ', $cached_navbar);
 
 			$ret = $root_phrase . ($value ? ' > ' : '') . $value;
 			if ($object->GetDBField('PrimaryCat')) {
 				$label = $params['primary_title'];
 				$ret .= ' (' . $this->Application->Phrase($label) . ')';
 			}
 
 			return $ret;
 		}
 
 		function GetMainID($params)
 		{
 			$object = $this->getObject($params);
 			$table_info = $object->getLinkedInfo();
 
 			return $table_info['ParentId'];
 		}
 	}
\ No newline at end of file
Index: branches/5.3.x/core/units/groups/groups_event_handler.php
===================================================================
--- branches/5.3.x/core/units/groups/groups_event_handler.php	(revision 16518)
+++ branches/5.3.x/core/units/groups/groups_event_handler.php	(revision 16519)
@@ -1,70 +1,70 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class GroupsEventHandler extends kDBEventHandler {
 
 		/**
 		 * Adds grouping by user id
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
 		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			switch ($event->Special) {
 				case 'user':
 					$user_id = $this->Application->GetVar('u_id');
 
 					if ( $user_id !== false ) {
 						// show only groups, that user doesn't belong to
 						$table_name = $this->Application->GetTempName(TABLE_PREFIX . 'UserGroupRelations', 'prefix:u');
 
 						$sql = 'SELECT GroupId
 								FROM ' . $table_name . '
 								WHERE PortalUserId = ' . (int)$user_id;
 						$group_ids = $this->Conn->GetCol($sql);
 
 						// add system groups
 						array_push($group_ids, $this->Application->ConfigValue('User_GuestGroup')); // Guest
 						array_push($group_ids, $this->Application->ConfigValue('User_LoggedInGroup')); // Everyone
 
 						$object->addFilter('already_member_filter', '%1$s.GroupId NOT IN (' . implode(',', $group_ids) . ')');
 					}
 					break;
 			}
 		}
 
 		/**
 		 * Refreshes left tree on save
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnSave(kEvent $event)
 		{
 			parent::OnSave($event);
 
 			$this->Application->StoreVar('refresh_tree', 1);
 		}
 	}
\ No newline at end of file
Index: branches/5.3.x/core/units/reviews/reviews_tag_processor.php
===================================================================
--- branches/5.3.x/core/units/reviews/reviews_tag_processor.php	(revision 16518)
+++ branches/5.3.x/core/units/reviews/reviews_tag_processor.php	(revision 16519)
@@ -1,242 +1,243 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class ReviewsTagProcessor extends kDBTagProcessor
 {
 	/**
 	 * Returns a link for editing product
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function ItemEditLink($params)
 	{
+		/** @var kDBList $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBList */
 
 		$item_prefix = $this->Application->findModule('Name', $object->GetDBField('Module'), 'Var');
 		$item_config = $this->Application->getUnitConfig($item_prefix);
 
 		$edit_template = $item_config->getAdminTemplatePath() . '/' . $item_config->getAdminTemplatePrefix() . 'edit';
 
 		$url_params = Array (
 			'm_opener'				=>	'd',
 			$item_prefix.'_mode'	=>	't',
 			$item_prefix.'_event'	=>	'OnEdit',
 			$item_prefix.'_id'		=>	$object->GetDBField('CatalogItemId'),
 			'm_cat_id'				=>	$object->GetDBField('CatalogItemCategory'),
 			'pass'					=>	'all,'.$item_prefix,
 			'no_pass_through'		=>	1,
 		);
 
 		return $this->Application->HREF($edit_template,'', $url_params);
 	}
 
 	function HelpfulLink($params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		$parent_prefix = $this->getUnitConfig()->getParentPrefix();
 
 		$params['events[' . $parent_prefix . ']'] = 'OnReviewHelpful';
 		$params['review_id'] = $object->GetID();
 
 		return $this->Application->ProcessParsedTag($parent_prefix, 'ItemLink', $params);
 	}
 
 	/**
 	 * Prints overall rating statistics
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	protected function PrintRatingPercents($params)
 	{
 		static $cache = null;
 
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		$parent_prefix = $this->getUnitConfig()->getParentPrefix();
 
+		/** @var kCatDBItem $main_object */
 		$main_object = $this->Application->recallObject($parent_prefix);
-		/* @var $main_object kCatDBItem */
 
 		if ( !isset($cache) ) {
 			$sql = 'SELECT COUNT(*), Rating
 					FROM ' . $object->TableName . '
 					WHERE ItemId = ' . $main_object->GetDBField('ResourceId') . '
 					GROUP BY Rating';
 			$cache = $this->Conn->GetCol($sql, 'Rating');
 		}
 
 		$ratings = array_reverse( array_keys( $object->GetFieldOption('Rating', 'options') ) );
 
 		if ( !isset($params['show_none']) || !$params['show_none'] ) {
 			$none_index = array_search(0, $ratings);
 
 			if ( $none_index !== false ) {
 				unset($ratings[$none_index]);
 			}
 		}
 
 		$ret = '';
 		$total = array_sum($cache);
 		$block_params = $this->prepareTagParams($params);
 		$block_params['name'] = $params['render_as'];
 		$block_params['strip_nl'] = 2;
 
 		foreach ($ratings as $rating) {
 			$block_params['rating'] = $rating;
 			$block_params['count'] = isset($cache[$rating]) ? $cache[$rating] : 0;
 			$block_params['percent'] = $total ? round(($block_params['count'] / $total) * 100) : 0;
 
 			$ret .= $this->Application->ParseBlock($block_params);
 		}
 
 		return $ret;
 	}
 
 	/**
 	 * Returns requested field value
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access public
 	 */
 	function Field($params)
 	{
 		$field = $this->SelectParam($params, 'name,field');
 
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		if ($field == 'ReviewText') {
 			if ($object->GetDBField('TextFormat') == 1) {
 				$params['no_special'] = 'no_special';
 			}
 			else {
 				unset($params['no_special']);
 			}
 		}
 
 		return parent::Field($params);
 	}
 
 	function AlreadyReviewed($params)
 	{
 		$parent_prefix = $this->getUnitConfig()->getParentPrefix();
 
+
+		/** @var kCatDBItem $main_object */
 		$main_object = $this->Application->recallObject($parent_prefix);
-		/* @var $main_object kCatDBItem */
 
+		/** @var SpamHelper $spam_helper */
 		$spam_helper = $this->Application->recallObject('SpamHelper');
-		/* @var $spam_helper SpamHelper */
 
 		$spam_helper->InitHelper($main_object->GetDBField('ResourceId'), 'Review', 0, $main_object->GetCol('ResourceId'));
 
 		return $spam_helper->InSpamControl();
 	}
 
 	function HasError($params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		return method_exists($object, 'GetErrorMsg') ? parent::HasError($params) : 0;
 	}
 
 	/**
 	 * Preserve main item id in subitem pagination url
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function PageLink($params)
 	{
+		/** @var kDBList $object */
 		$object = $this->getObject($params);
-		/* @var kDBList */
 
 		$parent_info = $object->getLinkedInfo();
 
 		if ($parent_info['ParentId'] > 0) {
 			$params['pass'] = 'm,'.$this->getPrefixSpecial().','.$parent_info['ParentPrefix'];
 		}
 
 		return parent::PageLink($params);
 	}
 
 	function InitCatalogTab($params)
 	{
 		$tab_params['mode'] = $this->Application->GetVar('tm'); // single/multi selection possible
 		$tab_params['special'] = $this->Application->GetVar('ts'); // use special for this tab
 		$tab_params['dependant'] = $this->Application->GetVar('td'); // is grid dependant on categories grid
 
 		// set default params (same as in catalog)
 		if ($tab_params['mode'] === false) $tab_params['mode'] = 'multi';
 		if ($tab_params['special'] === false) $tab_params['special'] = '';
 		if ($tab_params['dependant'] === false) $tab_params['dependant'] = 'yes';
 
 		// pass params to block with tab content
 		$params['name'] = $params['render_as'];
 		$params['prefix'] = trim($this->Prefix.'.'.($tab_params['special'] ? $tab_params['special'] : $this->Special), '.');
 
 		$params['cat_prefix'] = trim('c.'.($tab_params['special'] ? $tab_params['special'] : $this->Special), '.');
 		$params['tab_mode'] = $tab_params['mode'];
 		$params['grid_name'] = ($tab_params['mode'] == 'multi') ? $params['default_grid'] : $params['radio_grid'];
 		$params['tab_dependant'] = $tab_params['dependant'];
 		$params['show_category'] = $tab_params['special'] == 'showall' ? 1 : 0; // this is advanced view -> show category name
 		$params['tab_name'] = $this->Application->GetVar('tab_name');
 
 		return $this->Application->ParseBlock($params, 1);
 	}
 
 	/**
 	 * Returns reviews count for each item type (in "Reviews" section)
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function CatalogItemCount($params)
 	{
 		$params['skip_quering'] = true;
 		$object =& $this->GetList($params);
 
 		return $object->GetRecordsCount(false) != $object->GetRecordsCount() ? $object->GetRecordsCount().' / '.$object->GetRecordsCount(false) : $object->GetRecordsCount();
 	}
 
 	/**
 	 * Dynamic votes indicator
 	 *
 	 * @param Array $params
 	 *
 	 * @return string
 	 */
 	function VotesIndicator($params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
+		/** @var RatingHelper $rating_helper */
 		$rating_helper = $this->Application->recallObject('RatingHelper');
-		/* @var $rating_helper RatingHelper */
 
 		$rating = isset($params['rating']) ? $params['rating'] : $object->GetDBField('Rating');
 		$small_style = array_key_exists('small_style', $params) ? $params['small_style'] : false;
 
 		return $rating_helper->ratingBarSimple($rating, '', null, $small_style);
 	}
-}
\ No newline at end of file
+}
Index: branches/5.3.x/core/units/reviews/reviews_event_handler.php
===================================================================
--- branches/5.3.x/core/units/reviews/reviews_event_handler.php	(revision 16518)
+++ branches/5.3.x/core/units/reviews/reviews_event_handler.php	(revision 16519)
@@ -1,645 +1,647 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class ReviewsEventHandler extends kDBEventHandler
 	{
 		/**
 		 * Returns special of main item for linking with sub-item
 		 *
 		 * @param kEvent $event
 		 * @return string
 		 * @access protected
 		 */
 		protected function getMainSpecial(kEvent $event)
 		{
 			if ( $event->Special == 'product' && !$this->Application->isAdmin ) {
 				// rev.product should auto-link
 				return '';
 			}
 
 			return parent::getMainSpecial($event);
 		}
 
 		/**
 		 * Checks REVIEW/REVIEW.PENDING permission by main object primary category (not current category)
 		 *
 		 * @param kEvent $event
 		 * @return bool
 		 * @access public
 		 */
 		public function CheckPermission(kEvent $event)
 		{
 			if ( $event->Name == 'OnAddReview' || $event->Name == 'OnCreate' ) {
+				/** @var kPermissionsHelper $perm_helper */
 				$perm_helper = $this->Application->recallObject('PermissionsHelper');
-				/* @var $perm_helper kPermissionsHelper */
 
 				$parent_prefix = $event->getUnitConfig()->getParentPrefix();
 
+
+				/** @var kCatDBItem $main_object */
 				$main_object = $this->Application->recallObject($parent_prefix);
-				/* @var $main_object kCatDBItem */
 
 				$perm_name = $this->getPermPrefix($event).'.REVIEW';
 				$res = 	$this->Application->CheckPermission($perm_name, 0, $main_object->GetDBField('CategoryId')) ||
 						$this->Application->CheckPermission($perm_name.'.PENDING', 0, $main_object->GetDBField('CategoryId'));
 
 				if ( !$res ) {
 					$event->status = kEvent::erPERM_FAIL;
 				}
 
 				return $res;
 			}
 
 			$check_events = Array (
 				'OnItemBuild', 'OnUpdate', /*'OnMassApprove', 'OnMassDecline'*/
 			);
 
 			$perm_category = $this->_getReviewCategory($event);
 
 			if ( in_array($event->Name, $check_events) ) {
 				// check for PRODUCT.VIEW permission
 
+				/** @var kPermissionsHelper $perm_helper */
 				$perm_helper = $this->Application->recallObject('PermissionsHelper');
-				/* @var $perm_helper kPermissionsHelper */
 
 				$perm_prefix = $this->getPermPrefix($event);
 
 				if ( $perm_category === false ) {
 					// no item id present -> allow
 					return true;
 				}
 
 				switch ($event->Name) {
 					case 'OnItemBuild':
 						$res = $this->Application->CheckPermission($perm_prefix . '.VIEW', 0, $perm_category);
 						break;
 
 					case 'OnUpdate':
 					case 'OnMassApprove':
 					case 'OnMassDecline':
 						$res = 	$this->Application->CheckPermission($perm_prefix . '.ADD', 0, $perm_category) ||
 								$this->Application->CheckPermission($perm_prefix . '.MODIFY', 0, $perm_category);
 						break;
 
 					default:
 						$res = false;
 						break;
 				}
 
 				if ( !$res ) {
 					$event->status = kEvent::erPERM_FAIL;
 				}
 
 				return $res;
 
 			}
 
 			return parent::CheckPermission($event);
 		}
 
 		/**
 		 * Returns primary category of review's main item
 		 *
 		 * @param kEvent $event
 		 * @return int
 		 */
 		function _getReviewCategory($event)
 		{
 			$items_info = $this->Application->GetVar($event->getPrefixSpecial());
 
 			if ($items_info) {
 				// rev:PresetFormFields is used to initialize new review creation
 				list ($review_id, ) = each($items_info);
 			}
 			else {
 				// when adding new review in admin
 				$review_id = false;
 
 			}
 
 			if (!$review_id) {
 				return false;
 			}
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			// 1. get main item resource id (use object, because of temp tables in admin)
 			$sql = 'SELECT ItemId
 					FROM ' . $object->TableName . '
 					WHERE ' . $object->IDField . ' = ' . $review_id;
 			$resource_id = $this->Conn->GetOne($sql);
 
 			// 2. set main item id (for permission checks)
 			$parent_prefix = $event->getUnitConfig()->getParentPrefix();
 			$parent_config = $this->Application->getUnitConfig($parent_prefix);
 
 			$sql = 'SELECT ' . $parent_config->getIDField() .'
 					FROM ' . $parent_config->getTableName() .'
 					WHERE ResourceId = ' . $resource_id;
 			$this->Application->SetVar($parent_prefix . '_id', $this->Conn->GetOne($sql));
 
 			// 3. get main item category
 			$sql = 'SELECT CategoryId
 					FROM ' . $this->Application->getUnitConfig('ci')->getTableName() .'
 					WHERE ItemResourceId = ' . $resource_id .' AND PrimaryCat = 1';
 			return $this->Conn->GetOne($sql);
 		}
 
 		/**
 		 * Returns prefix for permissions
 		 *
 		 * @param kEvent $event
 		 */
 		function getPermPrefix($event)
 		{
 			$main_prefix = $this->Application->GetTopmostPrefix($event->Prefix, true);
 			// this will return LINK for l, ARTICLE for n, TOPIC for bb, PRODUCT for p
 
 			return $this->Application->getUnitConfig($main_prefix)->getPermItemPrefix();
 		}
 
 		/**
 		 * Apply any custom changes to list's sql query
 		 *
 		 * @param kEvent $event
 		 * @access protected
 		 * @see OnListBuild
 		 */
 		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			if ( !$this->Application->isAdminUser ) {
 				$object->addFilter('active', '%1$s.Status = ' . STATUS_ACTIVE);
 			}
 
 			switch ($event->Special) {
 				case 'showall':
 					$object->clearFilters();
 					break;
 
 				case 'item': // used ?
 					$object->clearFilters();
 					$parent_info = $object->getLinkedInfo();
 
+					/** @var kDBItem $parent */
 					$parent = $this->Application->recallObject($parent_info['ParentPrefix']);
-					/* @var $parent kDBItem */
 
 					$object->addFilter('item_reviews', '%1$s.ItemId = ' . $parent->GetDBField('ResourceId'));
 					break;
 
 				case 'products': // used in In-Portal (Structure & Data -> Reviews section)
 					$object->removeFilter('parent_filter'); // this is important
 					$object->addFilter('product_reviews', 'pr.ResourceId IS NOT NULL');
 					break;
 			}
 
 			if ( preg_match('/(.*)-rev/', $event->Prefix, $regs) ) {
 				// "Structure & Data" -> "Reviews" (section in K4)
 				$item_type = $this->Application->getUnitConfig($regs[1])->getItemType();
 				$object->addFilter('itemtype_filter', '%1$s.ItemType = ' . $item_type);
 
 				if ( $this->Application->isAdmin ) {
 					// temporarily solution so we can see sub-items on separate grid in Admin
 					$object->removeFilter('parent_filter');
 				}
 			}
 
 			if ( $event->getEventParam('type') == 'current_user' ) {
 				$object->addFilter('current_user', '%1$s.CreatedById = ' . $this->Application->RecallVar('user_id'));
 				$object->addFilter('current_ip', '%1$s.IPAddress = "' . $this->Application->getClientIp() . '"');
 			}
 		}
 
 		/**
 		 * Adds review from front in case if user is logged in
 		 *
 		 * @param kEvent $event
 		 */
 		function OnAddReview($event)
 		{
 			$event->CallSubEvent('OnCreate');
 		}
 
 		/**
 		 * Get new review status on user review permission
 		 *
 		 * @param kEvent $event
 		 * @return int
 		 */
 		function getReviewStatus($event)
 		{
 			$parent_prefix = $event->getUnitConfig()->getParentPrefix();
 
+
+			/** @var kCatDBItem $main_object */
 			$main_object = $this->Application->recallObject($parent_prefix);
-			/* @var $main_object kCatDBItem */
 
 			$ret = STATUS_DISABLED;
 			$perm_name = $this->getPermPrefix($event).'.REVIEW';
 			if ($this->Application->CheckPermission($perm_name, 0, $main_object->GetDBField('CategoryId'))) {
 				$ret = STATUS_ACTIVE;
 			}
 			else if ($this->Application->CheckPermission($perm_name.'.PENDING', 0, $main_object->GetDBField('CategoryId'))) {
 				$ret = STATUS_PENDING;
 			}
 
 			return $ret;
 		}
 
 		/**
 		 * Prefills all fields on front-end
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemCreate(kEvent $event)
 		{
 			parent::OnBeforeItemCreate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$parent_info = $object->getLinkedInfo();
 			$item_type = $this->Application->getUnitConfig($parent_info['ParentPrefix'])->getItemType();
 
 			$object->SetDBField('IPAddress', $this->Application->getClientIp());
 			$object->SetDBField('ItemType', $item_type);
 			$object->SetDBField('Module', $this->Application->findModule('Var', $parent_info['ParentPrefix'], 'Name'));
 
 			if ( $this->Application->isAdminUser ) {
 				// don't perform spam control on admin
 				return ;
 			}
 
+			/** @var SpamHelper $spam_helper */
 			$spam_helper = $this->Application->recallObject('SpamHelper');
-			/* @var $spam_helper SpamHelper */
 
 			$spam_helper->InitHelper($parent_info['ParentId'], 'Review', 0);
 
 			if ( $spam_helper->InSpamControl() ) {
 				$event->status = kEvent::erFAIL;
 				$object->SetError('ReviewText', 'too_frequent', 'lu_ferror_review_duplicate');
 				return;
 			}
 
 			$rating = $object->GetDBField('Rating');
 			if ( $rating < 1 || $rating > 5 ) {
 				$object->SetDBField('Rating', null);
 			}
 
 			$object->SetDBField('ItemId', $parent_info['ParentId']); // ResourceId
 			$object->SetDBField('CreatedById', $this->Application->RecallVar('user_id'));
 
 			$object->SetDBField('Status', $this->getReviewStatus($event));
 			$object->SetDBField('TextFormat', 0); // set plain text format directly
 		}
 
 		/**
 		 * Sets correct rating value
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemUpdate(kEvent $event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$rating = $object->GetDBField('Rating');
 
 			if ( !$rating ) {
 				$object->SetDBField('Rating', null);
 			}
 		}
 
 		/**
 		 * Updates item review counter
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemCreate(kEvent $event)
 		{
 			parent::OnAfterItemCreate($event);
 
 			$this->updateSubitemCounters($event);
 
 			if ( !$this->Application->isAdminUser ) {
+				/** @var SpamHelper $spam_helper */
 				$spam_helper = $this->Application->recallObject('SpamHelper');
-				/* @var $spam_helper SpamHelper */
 
+				/** @var kDBItem $object */
 				$object = $event->getObject();
-				/* @var $object kDBItem */
 
 				$parent_info = $object->getLinkedInfo();
 
 				$config_mapping = $event->getUnitConfig()->getConfigMapping();
 				$review_settings = $config_mapping['ReviewDelayValue'] . ':' . $config_mapping['ReviewDelayInterval'];
 				$spam_helper->InitHelper($parent_info['ParentId'], 'Review', $review_settings);
 
 				$spam_helper->AddToSpamControl();
 
 				$review_status = $object->GetDBField('Status');
 
 				if ( $review_status == STATUS_ACTIVE || $review_status == STATUS_PENDING ) {
 					$send_params = $object->getEmailParams();
 					$email_event = $this->getPermPrefix($event) . '.REVIEW.' . ($review_status == STATUS_ACTIVE ? 'ADD' : 'ADD.PENDING');
 
 					$this->Application->emailUser($email_event, $object->GetDBField('CreatedById'), $send_params);
 					$this->Application->emailAdmin($email_event, null, $send_params);
 				}
 			}
 		}
 
 		/**
 		 * Updates item review counter
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemUpdate(kEvent $event)
 		{
 			parent::OnAfterItemUpdate($event);
 
 			$this->updateSubitemCounters($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			if ( $this->Application->isAdminUser && !$object->IsTempTable() ) {
 				// send email on review status change from reviews grid in admin
 				$review_status = $object->GetDBField('Status');
 				$process_status = Array (STATUS_ACTIVE, STATUS_DISABLED);
 
 				if ( ($review_status != $object->GetOriginalField('Status')) && in_array($review_status, $process_status) ) {
 					$this->_loadMainObject($event);
 
 					$email_event = $this->getPermPrefix($event) . '.REVIEW.' . ($review_status == STATUS_ACTIVE ? 'APPROVE' : 'DENY');
 					$this->Application->emailUser($email_event, $object->GetDBField('CreatedById'), $object->getEmailParams());
 				}
 			}
 		}
 
 		/**
 		 * Loads main object of review (link, article, etc.)
 		 *
 		 * @param kEvent $event
 		 * @return kCatDBItem
 		 */
 		function _loadMainObject($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$config = $event->getUnitConfig();
 			$parent_prefix = $config->getParentPrefix();
 
+			/** @var kDBItem $main_object */
 			$main_object = $this->Application->recallObject($parent_prefix, null, Array ('skip_autoload' => true));
-			/* @var $main_object kDBItem */
 
 			$main_object->Load($object->GetDBField($config->getForeignKey()), $config->getParentTableKey());
 		}
 
 		/**
 		 * Updates total review counter, cached rating, votes count
 		 *
 		 * @param kEvent $event
 		 */
 		function updateSubitemCounters($event)
 		{
 			if ( $event->Special == '-item' ) {
 				// ignore Main Item Copy/Pasting and Deleting
 				return;
 			}
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$parent_prefix = $event->getUnitConfig()->getParentPrefix();
 			$parent_table = $this->Application->getUnitConfig($parent_prefix)->getTableName();
 
 			if ( $object->IsTempTable() ) {
 				$parent_table = $this->Application->GetTempName($parent_table, 'prefix:' . $object->Prefix);
 			}
 
 			$fields_hash = Array ('CachedReviewsQty' => 0, 'CachedRating' => 0, 'CachedVotesQty' => 0);
 
 			// 1. update review counter
 			$sql = 'SELECT COUNT(ReviewId)
 					FROM ' . $object->TableName . '
 					WHERE ItemId = ' . $object->GetDBField('ItemId');
 			$fields_hash['CachedReviewsQty'] = $this->Conn->GetOne($sql);
 
 			// 2. update votes counter + rating
 			$rating = $object->GetDBField('Rating');
 
 			$sql = 'SELECT CachedRating, CachedVotesQty
 					FROM ' . $parent_table . '
 					WHERE ResourceId = ' . $object->GetDBField('ItemId');
 			$parent_data = $this->Conn->GetRow($sql);
 
 			$avg_rating = $parent_data['CachedRating'];
 			$votes_count = $parent_data['CachedVotesQty'];
 
 			switch ($event->Name) {
 				case 'OnAfterItemCreate': // adding new review with rating
 					$this->changeRating($avg_rating, $votes_count, $rating, '+');
 					break;
 
 				case 'OnAfterItemDelete':
 					$this->changeRating($avg_rating, $votes_count, $rating, '-');
 					break;
 
 				case 'OnAfterItemUpdate':
 					$this->changeRating($avg_rating, $votes_count, $object->GetOriginalField('Rating'), '-');
 					$this->changeRating($avg_rating, $votes_count, $rating, '+');
 					break;
 			}
 
 			$fields_hash['CachedRating'] = "$avg_rating";
 			$fields_hash['CachedVotesQty'] = $votes_count;
 
 			$this->Conn->doUpdate($fields_hash, $parent_table, 'ResourceId = ' . $object->GetDBField('ItemId'));
 		}
 
 		/**
 		 * Changes average rating and votes count based on requested operation
 		 *
 		 * @param float $avg_rating average rating before new vote
 		 * @param int $votes_count votes count before new vote
 		 * @param int $rating new vote (from 1 to 5)
 		 * @param string $operation requested operation (+ / -)
 		 */
 		function changeRating(&$avg_rating, &$votes_count, $rating, $operation)
 		{
 			if ( $rating < 1 || $rating > 5 ) {
 				return;
 			}
 
 			if ( $operation == '+' ) {
 				$avg_rating = (($avg_rating * $votes_count) + $rating) / ($votes_count + 1);
 				++$votes_count;
 			}
 			else {
 				if ( $votes_count > 1 ) { // escape division by 0
 					$avg_rating = (($avg_rating * $votes_count) - $rating) / ($votes_count - 1);
 				}
 				else {
 					$avg_rating = (($avg_rating * $votes_count) - $rating) / 1;
 				}
 				--$votes_count;
 			}
 		}
 
 		/**
 		 * Updates main item cached review counter
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemDelete(kEvent $event)
 		{
 			parent::OnAfterItemDelete($event);
 
 			$this->updateSubitemCounters($event);
 		}
 
 		/**
 		 * Creates review & redirect to confirmation template
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnCreate(kEvent $event)
 		{
 			parent::OnCreate($event);
 
 			if ( $event->status != kEvent::erSUCCESS || $this->Application->isAdmin ) {
 				return;
 			}
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			if ( $this->Application->GetVar('ajax') == 'yes' ) {
+				/** @var AjaxFormHelper $ajax_form_helper */
 				$ajax_form_helper = $this->Application->recallObject('AjaxFormHelper');
-				/* @var $ajax_form_helper AjaxFormHelper */
 
 				$params = Array ('status' => 'OK');
 
 				if ( $event->status != kEvent::erSUCCESS ) {
 					$ajax_form_helper->prepareJSONErrors($event, $params);
 				}
 
 				// let FormManager decide what template to show
 				$params['review_status'] = $object->GetDBField('Status');
 
 				$ajax_form_helper->sendResponse($event, $params);
 			}
 			else {
 				$event->SetRedirectParam('opener', 's');
 				$next_template = $object->GetDBField('Status') == STATUS_ACTIVE ? 'success_template' : 'success_pending_template';
 				$event->redirect = $this->Application->GetVar($next_template);
 
 				$parent_prefix = $event->getUnitConfig()->getParentPrefix();
 				$event->SetRedirectParam('pass', 'm,'.$parent_prefix);
 			}
 		}
 
 		/**
 		 * Makes left join to item's table, when in separate grid
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterConfigRead(kEvent $event)
 		{
 			parent::OnAfterConfigRead($event);
 
 			if (preg_match('/(.*)-rev/', $event->Prefix, $regs) && $this->Application->prefixRegistred($regs[1])) {
 				// "Structure & Data" -> "Reviews" (section in K4)
 
 				$config = $event->getUnitConfig();
 				$item_config = $this->Application->getUnitConfig($regs[1]);
 
 				// 1. add join to items table (for "Structure & Data" -> "Reviews" section)
 				$item_table = $item_config->getTableName();
 				$ci_table = $this->Application->getUnitConfig('ci')->getTableName();
 
 				$list_sql = $config->getListSQLsBySpecial('');
 				$list_sql .= ' LEFT JOIN '.$item_table.' item_table ON item_table.ResourceId = %1$s.ItemId';
 				$list_sql .= ' LEFT JOIN '.$ci_table.' ci ON item_table.ResourceId = ci.ItemResourceId AND ci.PrimaryCat = 1';
 				$config->setListSQLsBySpecial('', $list_sql);
 
 				// 2. add calculated field
 				$config->addCalculatedFieldsBySpecial('', Array (
 					'CatalogItemName' => 'item_table.' . $this->getTitleField($regs[1]),
 					'CatalogItemId' => 'item_table.' . $item_config->getIDField(),
 					'CatalogItemCategory' => 'ci.CategoryId',
 				));
 			}
 		}
 
 		/**
 		 * Convert TitleField field of kMultiLanguage formatter used for it
 		 *
 		 * @param string $prefix
 		 * @return string
 		 */
 		function getTitleField($prefix)
 		{
 			$config = $this->Application->getUnitConfig($prefix);
 			$lang_prefix = 'l'.$this->Application->GetVar('m_lang').'_';
 
 			$title_field = $config->getTitleField();
 			$field_options = $config->getFieldByName($title_field);
 
 			$formatter_class = isset($field_options['formatter']) ? $field_options['formatter'] : '';
 
 			if ($formatter_class == 'kMultiLanguage' && !isset($field_options['master_field'])) {
 				$title_field = $lang_prefix.$title_field;
 			}
 
 			return $title_field;
 		}
 
 		/**
 		 * Set's new perpage for Category Item Reviews (used on Front-end)
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnSetPerPage(kEvent $event)
 		{
 			parent::OnSetPerPage($event);
 
 			$parent_prefix = $event->getUnitConfig()->getParentPrefix();
 			$event->SetRedirectParam('pass', 'm,' . $event->getPrefixSpecial() . ',' . $parent_prefix);
 		}
 	}
\ No newline at end of file
Index: branches/5.3.x/core/units/forms/form_submissions/form_submissions_eh.php
===================================================================
--- branches/5.3.x/core/units/forms/form_submissions/form_submissions_eh.php	(revision 16518)
+++ branches/5.3.x/core/units/forms/form_submissions/form_submissions_eh.php	(revision 16519)
@@ -1,544 +1,544 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class FormSubmissionsEventHandler extends kDBEventHandler {
 
 		/**
 		 * Checks user permission to execute given $event
 		 *
 		 * @param kEvent $event
 		 * @return bool
 		 * @access public
 		 */
 		public function CheckPermission(kEvent $event)
 		{
 			if ( !$this->Application->isAdmin ) {
 				if ( $event->Name == 'OnCreate' ) {
 					// anybody can submit forms on front
 					return true;
 				}
 			}
 
 			$section = $event->getSection();
 			$form_id = $this->Application->GetVar('form_id');
 
 			$event->setEventParam('PermSection', $section . ':' . $form_id);
 
 			return parent::CheckPermission($event);
 		}
 
 		/**
 		 * Always allow to view feedback form
 		 *
 		 * @return void
 		 * @access protected
 		 * @see kEventHandler::$permMapping
 		 */
 		protected function mapPermissions()
 		{
 			parent::mapPermissions();
 
 			$permissions = Array (
 				'OnItemBuild' => Array ('self' => true),
 				'OnEdit' => Array ('self' => 'view', 'subitem' => 'view'),
 			);
 
 			$this->permMapping = array_merge($this->permMapping, $permissions);
 		}
 
 		/**
 		 * Returns filter block based on field element type
 		 *
 		 * @param string $element_type
 		 * @return string
 		 */
 		function _getFilterBlock($element_type)
 		{
 			$mapping = Array (
 				'text' => 'grid_like_filter',
 				'select' => 'grid_options_filter',
 				'radio' => 'grid_options_filter',
 				'checkbox' => 'grid_options_filter',
 				'password' => 'grid_like_filter',
 				'textarea' => 'grid_like_filter',
 				'label' => 'grid_like_filter',
 				'upload' => 'grid_empty_filter',
 			);
 
 			return $mapping[$element_type];
 		}
 
 		protected function OnBuildFormFields(kEvent $event)
 		{
 			$form_id = $this->Application->GetVar('form_id');
 
 			if ( !$form_id ) {
 				return;
 			}
 
 			$config = $event->getUnitConfig();
 
+			/** @var InpCustomFieldsHelper $helper */
 			$helper = $this->Application->recallObject('InpCustomFieldsHelper');
-			/* @var $helper InpCustomFieldsHelper */
 
 			$sql = 'SELECT *
 					FROM ' . TABLE_PREFIX . 'FormFields
 					WHERE FormId = ' . (int)$form_id . '
 					ORDER BY Priority DESC';
 			$fields = $this->Conn->Query($sql, 'FormFieldId');
 
 			$use_options = Array ('radio', 'select', 'checkbox');
 			$check_visibility = $this->Application->LoggedIn() && !$this->Application->isAdminUser;
 
 			foreach ($fields as $field_id => $options) {
 				$field_visible = $check_visibility ? $options['Visibility'] == SubmissionFormField::VISIBILITY_EVERYONE : true;
 				$field_options = Array ('type' => 'string', 'default' => $options['DefaultValue']);
 
 				if ( $options['Required'] && $field_visible ) {
 					$field_options['required'] = 1;
 				}
 
 				if ( $options['Validation'] == 1 ) {
 					$field_options['formatter'] = 'kFormatter';
 					$field_options['regexp'] = '/^(' . REGEX_EMAIL_USER . '@' . REGEX_EMAIL_DOMAIN . ')$/i';
 				}
 
 				if ( $options['DisplayInGrid'] ) {
 					$title = $options['Prompt'];
 
 					if ( substr($title, 0, 1) == '+' ) {
 						$this->Application->Phrases->AddCachedPhrase('form_col_title' . $field_id, substr($title, 1));
 						$title = 'form_col_title' . $field_id;
 					}
 
 					$grid_field_options = Array (
 						'title' => $title, 'no_special' => 1, 'nl2br' => 1, 'first_chars' => 200,
 						'filter_block' => $this->_getFilterBlock($options['ElementType'])
 					);
 
 					if ( $options['ElementType'] == 'upload' ) {
 						$grid_field_options['data_block'] = 'grid_upload_td';
 					}
 
 					if ( $options['Validation'] == 1 ) {
 						$grid_field_options['data_block'] = 'grid_email_td';
 					}
 
 					$config->addGridFields('Default', $grid_field_options, 'fld_' . $field_id);
 				}
 
 				if ( $options['ElementType'] == 'checkbox' && !$options['ValueList'] ) {
 					// fix case, when user haven't defined any options for checkbox
 					$options['ValueList'] = '1=la_Yes||0=la_No';
 				}
 
 				if ( in_array($options['ElementType'], $use_options) && $options['ValueList'] ) {
 					// field type can have options and user have defined them too
 					$field_options['options'] = $helper->GetValuesHash($options['ValueList']);
 					$field_options['formatter'] = 'kOptionsFormatter';
 				}
 
 				if ( $options['ElementType'] == 'password' ) {
 					$field_options['formatter'] = 'kPasswordFormatter';
 					$field_options['hashing_method'] = PasswordHashingMethod::NONE;
 					$field_options['verify_field'] = 'fld_' . $field_id . '_verify';
 				}
 
 				if ( $options['ElementType'] == 'upload' ) {
 					$field_options['formatter'] = 'kUploadFormatter';
 					$field_options['upload_dir'] = WRITEBALE_BASE . DIRECTORY_SEPARATOR . 'user_files' . DIRECTORY_SEPARATOR . 'form_submissions';
 
 					if ( $options['UploadMaxSize'] ) {
 						$field_options['max_size'] = $options['UploadMaxSize'] * 1024; // convert Kbytes to bytes
 					}
 
 					if ( $options['UploadExtensions'] ) {
 						$field_options['file_types'] = '*.' . implode(';*.', explode(',', $options['UploadExtensions']));
 					}
 				}
 
 				$config->addFields($field_options, 'fld_' . $field_id);
 			}
 		}
 
 		/**
 		 * Apply any custom changes to list's sql query
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
 		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			$object->addFilter('form_filter', '%1$s.FormId = ' . (int)$this->Application->GetVar('form_id'));
 		}
 
 		/**
 		 * Allows user to see it's last feedback form data
 		 *
 		 * @param kEvent $event
 		 * @return int
 		 * @access public
 		 */
 		public function getPassedID(kEvent $event)
 		{
 			if ( $event->Special == 'last' ) {
 				// allow user to see his last submitted form
 				return $this->Application->RecallVar('last_submission_id');
 			}
 
 			if ( $this->Application->isAdminUser ) {
 				// don't check ids in admin
 				return parent::getPassedID($event);
 			}
 
 			// no way to see other user's form submission by giving it's ID directly in url
 			return 0;
 		}
 
 		/**
 		 * Creates new form submission from Front-End
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnCreate(kEvent $event)
 		{
 			parent::OnCreate($event);
 
 			if ( $event->status != kEvent::erSUCCESS ) {
 				return;
 			}
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			// allows user to view only it's last submission
 			$this->Application->StoreVar('last_submission_id', $object->GetID());
 
+			/** @var FormSubmissionHelper $form_submission_helper */
 			$form_submission_helper = $this->Application->recallObject('FormSubmissionHelper');
-			/* @var $form_submission_helper FormSubmissionHelper */
 
 			$form =& $form_submission_helper->getForm($object);
 
 			$notify_email = $form->GetDBField('SubmitNotifyEmail');
 
 			if ( $notify_email ) {
 				$send_params = $object->getEmailParams(Array (
 					'to_name' => $notify_email,
 					'to_email' => $notify_email,
 				));
 
 				$this->Application->emailAdmin('FORM.SUBMITTED', null, $send_params);
 			}
 			else {
 				$this->Application->emailAdmin('FORM.SUBMITTED', null, $object->getEmailParams());
 			}
 
 //			$this->Application->emailUser('FORM.SUBMITTED', null, Array ('to_email' => ''));
 
 			$event->SetRedirectParam('opener', 's');
 			$event->SetRedirectParam('m_cat_id', 0);
 
+			/** @var kDBItem $theme */
 			$theme = $this->Application->recallObject('theme.current');
-			/* @var $theme kDBItem */
 
 			$template = $this->Application->unescapeRequestVariable($this->Application->GetVar('success_template'));
 			$alias_template = $theme->GetField('TemplateAliases', $template);
 
 			$event->redirect = $alias_template ? $alias_template : $template;
 		}
 
 		/**
 		 * Processes Captcha code
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemCreate(kEvent $event)
 		{
 			parent::OnBeforeItemCreate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$object->SetDBField('IPAddress', $this->Application->getClientIp());
 
 			if ( !$object->GetDBField('ReferrerURL') ) {
 				$referrer = $this->Application->GetVar('original_referrer');
 
 				if ( !$referrer ) {
 					$base_url = preg_quote($this->Application->BaseURL(), '/');
 					$referrer = preg_replace('/^' . $base_url . '/', '/', $_SERVER['HTTP_REFERER'], 1);
 				}
 
 				$object->SetDBField('ReferrerURL', $referrer);
 			}
 
+			/** @var FormSubmissionHelper $form_submission_helper */
 			$form_submission_helper = $this->Application->recallObject('FormSubmissionHelper');
-			/* @var $form_submission_helper FormSubmissionHelper */
 
 			$form =& $form_submission_helper->getForm($object);
 
 			// validate captcha code
 			if ( $form->GetDBField('UseSecurityImage') && !$this->Application->LoggedIn() ) {
+				/** @var kCaptchaHelper $captcha_helper */
 				$captcha_helper = $this->Application->recallObject('CaptchaHelper');
-				/* @var $captcha_helper kCaptchaHelper */
 
 				$captcha_helper->validateCode($event, false);
 			}
 		}
 
 		/**
 		 * Checks, that target submission was selected for merging
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemUpdate(kEvent $event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$object->setRequired('MergeToSubmission', $object->GetDBField('IsMergeToSubmission'));
 		}
 
 		/**
 		 * Passes form_id, when using "Prev"/"Next" toolbar buttons
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnPreSaveAndGo(kEvent $event)
 		{
 			parent::OnPreSaveAndGo($event);
 
 			if ( $event->status == kEvent::erSUCCESS ) {
 				$event->SetRedirectParam('pass', 'm,form,formsubs');
 			}
 		}
 
 		/**
 		 * Saves edited item in temp table and goes
 		 * to passed tabs, by redirecting to it with OnPreSave event
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnPreSaveAndGoToTab(kEvent $event)
 		{
 			parent::OnPreSaveAndGoToTab($event);
 
 			if ( $event->status == kEvent::erSUCCESS ) {
 				$event->SetRedirectParam('pass', 'm,form,formsubs');
 			}
 		}
 
 		/**
 		 * Set's new per-page for grid
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnSetPerPage(kEvent $event)
 		{
 			parent::OnSetPerPage($event);
 
 			$event->SetRedirectParam('pass', 'm,form,' . $event->getPrefixSpecial());
 		}
 
 		/**
 		 * Occurs when page is changed (only for hooking)
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnSetPage(kEvent $event)
 		{
 			parent::OnSetPage($event);
 
 			$event->SetRedirectParam('pass', 'm,form,' . $event->getPrefixSpecial());
 		}
 
 		/**
 		 * Fills merge-to dropdown
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemLoad(kEvent $event)
 		{
 			parent::OnAfterItemLoad($event);
 
 			if ($event->Special == 'merge-to') {
 				return ;
 			}
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$form_id = $object->GetDBField('FormId');
 			$email_field = $this->getFieldNameByRole($form_id, SubmissionFormField::COMMUNICATION_ROLE_EMAIL);
 
 			if (!$email_field) {
 				return ;
 			}
 
+			/** @var kDBItem $merge_to */
 			$merge_to = $this->Application->recallObject($event->Prefix . '.merge-to', null, Array ('skip_autoload' => true));
-			/* @var $merge_to kDBItem */
 
 			$sql = $merge_to->GetSelectSQL() . ' WHERE (FormId = ' . $form_id . ') AND (' . $email_field . ' = ' . $this->Conn->qstr( $object->GetDBField($email_field) ) . ')';
 			$submissions = $this->Conn->Query($sql, $object->IDField);
 
 			// remove this submission
 			unset($submissions[ $object->GetID() ]);
 
 			if (!$submissions) {
 				return ;
 			}
 
 			$options = Array ();
 
 			$name_field = $this->getFieldNameByRole($form_id, SubmissionFormField::COMMUNICATION_ROLE_NAME);
 			$subject_field = $this->getFieldNameByRole($form_id, SubmissionFormField::COMMUNICATION_ROLE_SUBJECT);
 
+			/** @var kDBItem $language */
 			$language = $this->Application->recallObject('lang.current');
-			/* @var $language kDBItem */
 
 			$date_format = $language->GetDBField('DateFormat');
 
 			foreach ($submissions as $submission_id => $submission_data) {
 				$option_title = ''; // SenderName (email@address.com) - Subject (06/29/2010)
 				$merge_to->LoadFromHash($submission_data);
 
 				if ($name_field) {
 					$option_title = $merge_to->GetDBField($name_field) . ' (' . $merge_to->GetDBField($email_field) . ') - ';
 				}
 				else {
 					$option_title = $merge_to->GetDBField($email_field) . ' - ';
 				}
 
 				if ($subject_field) {
 					$option_title .= $merge_to->GetField($subject_field) . ' (' . $merge_to->GetField('SubmissionTime', $date_format) . ')';
 				}
 				else {
 					$option_title .= $merge_to->GetField('SubmissionTime', $date_format);
 				}
 
 				$options[$submission_id] = $option_title;
 			}
 
 			$object->SetFieldOption('MergeToSubmission', 'options', $options);
 		}
 
 		/**
 		 * Returns submission field name based on given role
 		 *
 		 * @param int $form_id
 		 * @param string $role
 		 * @return string
 		 * @see FormSubmissionHelper::getFieldByRole()
 		 */
 		function getFieldNameByRole($form_id, $role)
 		{
 			$form_submission_helper = $this->Application->recallObject('FormSubmissionHelper');
 			/* @var $form_submission_helper FormSubmissionHelper */
 
 			return $form_submission_helper->getFieldNameByRole($form_id, $role);
 		}
 
 		/**
 		 * Performs submission merge
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnUpdate(kEvent $event)
 		{
 			parent::OnUpdate($event);
 
 			if ($event->status == kEvent::erSUCCESS) {
+				/** @var kDBItem $object */
 				$object = $event->getObject();
-				/* @var $object kDBItem */
 
 				$merge_to = $object->GetDBField('MergeToSubmission');
 
 				if (!$merge_to) {
 					return ;
 				}
 
 				$form_id = $object->GetDBField('FormId');
 
 				$sql = 'SELECT *
 						FROM ' . TABLE_PREFIX . 'Forms
 						WHERE FormId = ' . $form_id;
 				$form_info = $this->Conn->GetRow($sql);
 
+				/** @var kDBItem $reply */
 				$reply = $this->Application->recallObject('submission-log.merge', null, Array ('skip_autoload' => true));
-				/* @var $reply kDBItem */
 
 				$email_field = $this->getFieldNameByRole($form_id, SubmissionFormField::COMMUNICATION_ROLE_EMAIL);
 				$subject_field = $this->getFieldNameByRole($form_id, SubmissionFormField::COMMUNICATION_ROLE_SUBJECT);
 				$body_field = $this->getFieldNameByRole($form_id, SubmissionFormField::COMMUNICATION_ROLE_BODY);
 
 				$reply->SetDBField('FormSubmissionId', $merge_to);
 
 				if ($email_field) {
 					$reply->SetDBField('FromEmail', $object->GetDBField($email_field));
 				}
 
 				$reply->SetDBField('ToEmail', $form_info['ReplyFromEmail']);
 
 				if ($subject_field) {
 					$reply->SetDBField('Subject', $object->GetDBField($subject_field));
 				}
 
 				if ($body_field) {
 					$reply->SetDBField('Message', $object->GetDBField($body_field));
 				}
 
 				$reply->SetDBField('SentOn_date', $object->GetDBField('SubmissionTime'));
 				$reply->SetDBField('SentOn_time', $object->GetDBField('SubmissionTime'));
 				$reply->SetDBField('MessageId', $object->GetDBField('MessageId'));
 				$reply->SetDBField('SentStatus', SUBMISSION_LOG_SENT);
 
 				// as if emails was really received via mailbox
 				$this->Application->SetVar('client_mode', 1);
 
 				if ($reply->Create()) {
 					// delete submission, since it was merged
 					$object->Delete();
 				}
 			}
 		}
 	}
Index: branches/5.3.x/core/units/forms/form_submissions/form_submission_tp.php
===================================================================
--- branches/5.3.x/core/units/forms/form_submissions/form_submission_tp.php	(revision 16518)
+++ branches/5.3.x/core/units/forms/form_submissions/form_submission_tp.php	(revision 16519)
@@ -1,60 +1,60 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class FormSubmissionTagProcessor extends kDBTagProcessor {
 
 	/**
 	 * Returns phrase translation by name
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access public
 	 */
 	function PhraseFromRequest($params)
 	{
 		$phrase_name = $this->Application->GetVar($params['name']);
 
 		if (array_key_exists('default', $params) && !$phrase_name) {
 			$phrase_name = $params['default'];
 		}
 
 		return $this->Application->Phrase($phrase_name);
 	}
 
 	/**
 	 * Allows to retrieve for submission field by it's name or role in email communications
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function FormField($params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
+		/** @var FormSubmissionHelper $form_submission_helper */
 		$form_submission_helper = $this->Application->recallObject('FormSubmissionHelper');
-		/* @var $form_submission_helper FormSubmissionHelper */
 
 		$formatted = !(array_key_exists('db', $params) && $params['db']);
 		$format = $formatted ? (array_key_exists('format', $params) ? $params['format'] : null) : null;
 
 		if ( array_key_exists('role', $params) ) {
 			return $form_submission_helper->getFieldByRole($object, $params['role'], $formatted, $format);
 		}
 
 		return $form_submission_helper->getFieldByName($object, $params['name'], $formatted, $format);
 	}
 }
Index: branches/5.3.x/core/units/forms/drafts/draft_eh.php
===================================================================
--- branches/5.3.x/core/units/forms/drafts/draft_eh.php	(revision 16518)
+++ branches/5.3.x/core/units/forms/drafts/draft_eh.php	(revision 16519)
@@ -1,59 +1,59 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class DraftEventHandler extends kDBEventHandler
 	{
 		/**
 		 * Sets user, who created draft
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemCreate(kEvent $event)
 		{
 			parent::OnBeforeItemCreate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$user_id = $this->Application->RecallVar('user_id');
 
 			$object->SetDBField('CreatedById', $user_id);
 		}
 
 		/**
 		 * Allows to load draft, that best matches given form submission
 		 *
 		 * @param kEvent $event
 		 * @return int
 		 * @access public
 		 */
 		public function getPassedID(kEvent $event)
 		{
 			if ( $event->Special == 'related' ) {
+				/** @var kDBItem $form_submission */
 				$form_submission = $this->Application->recallObject('formsubs');
-				/* @var $form_submission kDBItem */
 
 				return Array (
 					'FormSubmissionId' => $form_submission->GetID(),
 					'CreatedById' => $this->Application->RecallVar('user_id'),
 				);
 			}
 
 			return parent::getPassedID($event);
 		}
 	}
\ No newline at end of file
Index: branches/5.3.x/core/units/forms/forms/forms_tp.php
===================================================================
--- branches/5.3.x/core/units/forms/forms/forms_tp.php	(revision 16518)
+++ branches/5.3.x/core/units/forms/forms/forms_tp.php	(revision 16519)
@@ -1,41 +1,41 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class FormsTagProcessor extends kDBTagProcessor{
 
 		function CheckBox($params)
 		{
+			/** @var kDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBItem */
 
 			$value = $object->GetDBField($this->SelectParam($params, 'name,field'));
 
 			if ( $value ) {
 				return 'checked';
 			}
 
 			if ( is_null($value) ) {
 				return $params['default'];
 			}
 
 			return '';
 		}
 
 		function MaxUploadSize($params)
 		{
 			return round(MAX_UPLOAD_SIZE / 1024 / 1024) . ' Mb';
 		}
 	}
\ No newline at end of file
Index: branches/5.3.x/core/units/forms/forms/forms_eh.php
===================================================================
--- branches/5.3.x/core/units/forms/forms/forms_eh.php	(revision 16518)
+++ branches/5.3.x/core/units/forms/forms/forms_eh.php	(revision 16519)
@@ -1,631 +1,631 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class FormsEventHandler extends kDBEventHandler {
 
 	/**
 	 * Allows to override standard permission mapping
 	 *
 	 * @return void
 	 * @access protected
 	 * @see kEventHandler::$permMapping
 	 */
 	protected function mapPermissions()
 	{
 		parent::mapPermissions();
 
 		$permissions = Array (
 			// user can view any form on front-end
 			'OnItemBuild' => Array ('self' => true),
 		);
 
 		$this->permMapping = array_merge($this->permMapping, $permissions);
 	}
 
 	protected function OnCreateSubmissionNodes(kEvent $event)
 	{
 		if ( defined('IS_INSTALL') && IS_INSTALL ) {
 			// skip any processing, because Forms table doesn't exists until install is finished
 			return;
 		}
 
 		$forms = $this->getForms();
 
 		if ( !$forms ) {
 			return;
 		}
 
 		$form_subsection = Array (
 			'parent' => 'in-portal:forms',
 			'icon' => 'form_submission',
 			'label' => '',
 			'url' => Array ('t' => 'submissions/submissions_list', 'pass' => 'm,form'),
 			'permissions' => Array ('view', 'add', 'edit', 'delete'),
 			'priority' => 1,
 			'type' => stTREE,
 		);
 
 		$priority = 1;
 		$config = $event->getUnitConfig();
 
 		foreach ($forms as $form_id => $form_name) {
 			$this->Application->Phrases->AddCachedPhrase('form_sub_label_'.$form_id, $form_name);
 			$this->Application->Phrases->AddCachedPhrase('la_description_in-portal:submissions:'.$form_id, $form_name.' Submissions');
 
 			$form_subsection['label'] = 'form_sub_label_'.$form_id;
 			$form_subsection['url']['form_id'] = $form_id;
 			$form_subsection['priority'] = $priority++;
 
 			$config->addSections($form_subsection, 'in-portal:submissions:' . $form_id);
 		}
 	}
 
 	protected function getForms()
 	{
 		$cache_key = 'forms[%FormSerial%]';
 		$forms = $this->Application->getCache($cache_key);
 
 		if ( $forms === false ) {
 			$this->Conn->nextQueryCachable = true;
 			$sql = 'SELECT Title, FormId
 					FROM ' . TABLE_PREFIX . 'Forms
 					ORDER BY Title ASC';
 			$forms = $this->Conn->GetCol($sql, 'FormId');
 
 			$this->Application->setCache($cache_key, $forms);
 		}
 
 		return $forms;
 	}
 
 	/**
 	 * Saves content of temp table into live and
 	 * redirects to event' default redirect (normally grid template)
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnSave(kEvent $event)
 	{
 		parent::OnSave($event);
 
 		if ( $event->status == kEvent::erSUCCESS ) {
 			$this->OnCreateFormFields($event);
 			$this->_deleteSectionCache();
 		}
 	}
 
 	/**
 	 * Deletes all selected items.
 	 * Automatically recurse into sub-items using temp handler, and deletes sub-items
 	 * by calling its Delete method if sub-item has AutoDelete set to true in its config file
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnMassDelete(kEvent $event)
 	{
 		parent::OnMassDelete($event);
 
 		if ( $event->status == kEvent::erSUCCESS ) {
 			$this->_deleteSectionCache();
 		}
 	}
 
 	function _deleteSectionCache()
 	{
 		$this->Application->HandleEvent(new kEvent('adm:OnResetSections'));
 
 		$this->Application->StoreVar('RefreshStructureTree', 1);
 	}
 
 	/**
 	 * Dynamically fills custom data config
 	 *
 	 * @param kEvent $event
 	 */
 	function OnCreateFormFields($event)
 	{
 		$cur_fields = $this->Conn->Query('DESCRIBE '.TABLE_PREFIX.'FormSubmissions', 'Field');
 		$cur_fields = array_keys($cur_fields);
 
 		// keep all fields, that are not created on the fly (includes ones, that are added during customizations)
 		foreach ($cur_fields as $field_index => $field_name) {
 			if (!preg_match('/^fld_[\d]+/', $field_name)) {
 				unset($cur_fields[$field_index]);
 			}
 		}
 
 		$desired_fields = $this->Conn->GetCol('SELECT CONCAT(\'fld_\', FormFieldId) FROM '.TABLE_PREFIX.'FormFields ORDER BY FormFieldId');
 
 		$sql = array();
 
 		$fields_to_add = array_diff($desired_fields, $cur_fields);
 		foreach ($fields_to_add as $field) {
 			$field_expression = $field.' Text NULL';
 			$sql[] = 'ADD COLUMN '.$field_expression;
 		}
 
 		$fields_to_drop = array_diff($cur_fields, $desired_fields);
 		foreach ($fields_to_drop as $field) {
 			$sql[] = 'DROP COLUMN '.$field;
 		}
 
 		if ($sql) {
 			$query = 'ALTER TABLE '.TABLE_PREFIX.'FormSubmissions '.implode(', ', $sql);
 			$this->Conn->Query($query);
 		}
 	}
 
 	/**
 	 * Enter description here...
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnFormSubmit($event)
 	{
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		$fields = explode(',', $this->Application->GetVar('fields'));
 		$required_fields = explode(',', $this->Application->GetVar('required_fields'));
 		$fields_params = $this->Application->GetVar('fields_params');
 
 		$virtual_fields = $event->getUnitConfig()->getVirtualFields();
 
 		foreach ($fields as $field) {
 			$virtual_fields[$field] = Array ();
 
 			if ( in_array($field, $required_fields) ) {
 				$virtual_fields[$field]['required'] = 1;
 			}
 
 			$params = getArrayValue($fields_params, $field);
 
 			if ( $params !== false ) {
 				if ( getArrayValue($params, 'Type') == 'email' ) {
 					$virtual_fields[$field]['formatter'] = 'kFormatter';
 					$virtual_fields[$field]['regexp'] = '/^(' . REGEX_EMAIL_USER . '@' . REGEX_EMAIL_DOMAIN . ')$/i';
 					$virtual_fields[$field]['error_msgs'] = Array ('invalid_format' => '!la_invalid_email!');
 				}
 
 				if ( getArrayValue($params, 'Type') == 'file' ) {
 					$virtual_fields[$field]['formatter'] = 'kUploadFormatter';
 					$virtual_fields[$field]['upload_dir'] = '/uploads/sketches/';
 				}
 			}
 		}
 
 		$object->SetVirtualFields($virtual_fields);
 		$field_values = $this->getSubmittedFields($event);
 		$checkboxes = explode(',', $this->Application->GetVar('checkbox_fields')); // MailingList,In-Link,In-Newz,In-Bulletin
 
 		foreach ($checkboxes as $checkbox) {
 			if ( isset($field_values[$checkbox]) ) {
 				$field_values[$checkbox] = 1;
 			}
 			else {
 				$field_values[$checkbox] = '0';
 			}
 		}
 
 		$object->SetFieldsFromHash($field_values);
 		$event->setEventParam('form_data', $field_values);
 
 		if ( $object->Validate() ) {
 			$event->redirect = $this->Application->GetVar('success_template');
 
 			$this->Application->emailAdmin($this->Application->GetVar('email_event'), null, $object->getEmailParams());
 
 			$send_params = $object->getEmailParams(Array (
 				'to_email' => $field_values[$this->Application->GetVar('email_field')],
 				'to_name' => $field_values[$this->Application->GetVar('name_field')]
 			));
 			$this->Application->emailUser($this->Application->GetVar('email_event'), null, $send_params);
 
 			if ( $field_values['MailingList'] ) {
 				$this->Application->StoreVar('SubscriberEmail', $field_values['Email']);
 				$this->Application->HandleEvent(new kEvent('u:OnSubscribeUser', Array ('no_unsubscribe' => 1)));
 			}
 		}
 		else {
 			$event->status = kEvent::erFAIL;
 		}
 	}
 
 	/**
 	 * Don't use security image, when form requires login
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnBeforeItemCreate(kEvent $event)
 	{
 		parent::OnBeforeItemCreate($event);
 
 		$this->itemChanged($event);
 	}
 
 	/**
 	 * Don't use security image, when form requires login
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnBeforeItemUpdate(kEvent $event)
 	{
 		parent::OnBeforeItemUpdate($event);
 
 		$this->itemChanged($event);
 	}
 
 	/**
 	 * Occurs before item is changed
 	 *
 	 * @param kEvent $event
 	 */
 	function itemChanged($event)
 	{
 		$this->_validatePopSettings($event);
 		$this->_disableSecurityImage($event);
 		$this->_setRequired($event);
 	}
 
 	/**
 	 * Validates POP3 settings (performs test connect)
 	 *
 	 * @param kEvent $event
 	 */
 	function _validatePopSettings($event)
 	{
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		$modes = Array ('Reply', 'Bounce');
 		$fields = Array ('Server', 'Port', 'Username', 'Password');
 		$changed_fields = array_keys( $object->GetChangedFields() );
 
 		foreach ($modes as $mode) {
 			$set = true;
 			$changed = false;
 
 			foreach ($fields as $field) {
 				$value = $object->GetDBField($mode . $field);
 
 				if (strlen( trim($value) ) == 0) {
 					$set = false;
 					break;
 				}
 
 				if (!$changed && in_array($mode . $field, $changed_fields)) {
 					$changed = true;
 				}
 			}
 
 			if ($set && $changed) {
 				// fields are set and at least on of them is changed
 				$connection_info = Array ();
 
 				foreach ($fields as $field) {
 					$connection_info[ strtolower($field) ] = $object->GetDBField($mode . $field);
 				}
 
+				/** @var POP3Helper $pop3_helper */
 				$pop3_helper = $this->Application->makeClass('POP3Helper', Array ($connection_info, 10));
-				/* @var $pop3_helper POP3Helper */
 
 				switch ( $pop3_helper->initMailbox(true) ) {
 					case 'socket':
 						$object->SetError($mode . 'Server', 'connection_failed');
 						break;
 
 					case 'login':
 						$object->SetError($mode . 'Username', 'login_failed');
 						break;
 
 					case 'list':
 						$object->SetError($mode . 'Server', 'message_listing_failed');
 						break;
 				}
 			}
 		}
 
 	}
 
 	/**
 	 * Makes email communication fields required, when form uses email communication
 	 *
 	 * @param kEvent $event
 	 */
 	function _setRequired($event)
 	{
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		$required = $object->GetDBField('EnableEmailCommunication');
 		$fields = Array (
 			'ReplyFromName', 'ReplyFromEmail', 'ReplyServer', 'ReplyPort', 'ReplyUsername', 'ReplyPassword',
 		);
 
 		if ($required && $object->GetDBField('BounceEmail')) {
 			$bounce_fields = Array ('BounceEmail', 'BounceServer', 'BouncePort', 'BounceUsername', 'BouncePassword');
 			$fields = array_merge($fields, $bounce_fields);
 		}
 
 		$object->setRequired($fields, $required);
 	}
 
 	/**
 	 * Don't use security image, when form requires login
 	 *
 	 * @param kEvent $event
 	 */
 	function _disableSecurityImage($event)
 	{
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		if ($object->GetDBField('RequireLogin')) {
 			$object->SetDBField('UseSecurityImage', 0);
 		}
 	}
 
 	/**
 	 * Queries pop3 server about new incoming mail
 	 *
 	 * @param kEvent $event
 	 */
 	function OnProcessReplies($event)
 	{
 		$this->_processMailbox($event, false);
 	}
 
 	/**
 	 * Queries pop3 server about new incoming mail
 	 *
 	 * @param kEvent $event
 	 */
 	function OnProcessBouncedReplies($event)
 	{
 		$this->_processMailbox($event, true);
 	}
 
 	/**
 	 * Queries pop3 server about new incoming mail
 	 *
 	 * @param kEvent $event
 	 * @param bool $bounce_mode
 	 */
 	function _processMailbox($event, $bounce_mode = false)
 	{
 		$config = $event->getUnitConfig();
 		$this->Application->SetVar('client_mode', 1);
 
 		$sql = 'SELECT *
 				FROM ' . $config->getTableName() . '
 				WHERE EnableEmailCommunication = 1';
 		$forms = $this->Conn->Query($sql, $config->getIDField());
 
+		/** @var MailboxHelper $mailbox_helper */
 		$mailbox_helper = $this->Application->recallObject('MailboxHelper');
-		/* @var $mailbox_helper MailboxHelper */
 
 		$field_prefix = $bounce_mode ? 'Bounce' : 'Reply';
 
 		foreach ($forms as $form_id => $form_info) {
 			$recipient_email = $bounce_mode ? $form_info['BounceEmail'] : $form_info['ReplyFromEmail'];
 
 			if ( !$recipient_email ) {
 				continue;
 			}
 
 			$mailbox_helper->process(
 				Array (
 					'server' => $form_info[$field_prefix . 'Server'],
 					'port' => $form_info[$field_prefix . 'Port'],
 					'username' => $form_info[$field_prefix . 'Username'],
 					'password' => $form_info[$field_prefix . 'Password']
 				),
 				Array (&$this, 'isValidRecipient'),
 				Array (&$this, 'processEmail'),
 				Array (
 					'recipient_email' => $recipient_email,
 					'bounce_mode' => $bounce_mode,
 					'form_info' => $form_info,
 				)
 			);
 		}
 	}
 
 	function isValidRecipient($params)
 	{
+		/** @var MailboxHelper $mailbox_helper */
 		$mailbox_helper = $this->Application->recallObject('MailboxHelper');
-		/* @var $mailbox_helper MailboxHelper */
 
 		$recipients = $mailbox_helper->getRecipients();
 		$recipient_email = $params['recipient_email'];
 
 		$emails_found = preg_match_all('/((' . REGEX_EMAIL_USER . ')(@' . REGEX_EMAIL_DOMAIN . '))/i', $recipients, $all_emails);
 
 		if (is_array($all_emails)) {
 			for ($i = 0; $i < $emails_found; $i++) {
 				if ($all_emails[1][$i] == $recipient_email) {
 					// only read messages, that are addresses to submission reply email
 					return true;
 				}
 			}
 		}
 
 		// If this is a forwarded message - we drop all the other aliases and deliver only to the x-forward to address;
 		if (preg_match('/((' . REGEX_EMAIL_USER . ')(@' . REGEX_EMAIL_DOMAIN . '))/i', $mailbox_helper->headers['x-forward-to'], $get_to_email)) {
 			if ($get_to_email[1] == $recipient_email) {
 				// only read messages, that are addresses to submission reply email
 				return true;
 			}
 		}
 
 		return false;
 	}
 
 	function processEmail($params, &$fields_hash)
 	{
 		if ( $params['bounce_mode'] ) {
 			// mark original message as bounced
 
+			/** @var MailboxHelper $mailbox_helper */
 			$mailbox_helper = $this->Application->recallObject('MailboxHelper');
-			/* @var $mailbox_helper MailboxHelper */
 
 			if ( !array_key_exists('attachments', $mailbox_helper->parsedMessage) ) {
 				// for now only parse bounces based on attachments, skip other bounce types
 				return false;
 			}
 
 			for ($i = 0; $i < count($mailbox_helper->parsedMessage['attachments']); $i++) {
 				$attachment =& $mailbox_helper->parsedMessage['attachments'][$i];
 
 				switch ( $attachment['headers']['content-type'] ) {
 					case 'message/delivery-status':
 						// save as BounceInfo
+						/** @var MimeDecodeHelper $mime_decode_helper */
 						$mime_decode_helper = $this->Application->recallObject('MimeDecodeHelper');
-						/* @var $mime_decode_helper MimeDecodeHelper */
 
 						$charset = $mailbox_helper->parsedMessage[$fields_hash['MessageType']][0]['charset'];
 						$fields_hash['Message'] = $mime_decode_helper->convertEncoding($charset, $attachment['data']);
 						break;
 
 					case 'message/rfc822':
 						// undelivered message
 						$fields_hash['Subject'] = $attachment['filename2'] ? $attachment['filename2'] : $attachment['filename'];
 						break;
 				}
 			}
 		}
 
 		if ( !preg_match('/^(.*) #verify(.*)$/', $fields_hash['Subject'], $regs) ) {
 			// incorrect subject, no verification code
 			$form_info = $params['form_info'];
 
 			if ( $form_info['ProcessUnmatchedEmails'] && ($fields_hash['FromEmail'] != $params['recipient_email']) ) {
 				// it's requested to convert unmatched emails to new submissions
 				$form_id = $form_info['FormId'];
 				$this->Application->SetVar('form_id', $form_id);
 
 				$form_submission_config = $this->Application->getUnitConfig('formsubs');
 
 				$sql = 'SELECT ' . $form_submission_config->getIDField() . '
 						FROM ' . $form_submission_config->getTableName() . '
 						WHERE MessageId = ' . $this->Conn->qstr($fields_hash['MessageId']);
 				$found = $this->Conn->GetOne($sql);
 
 				if ( $found ) {
 					// don't process same message twice
 					return false;
 				}
 
 				$sql = 'SELECT *
 						FROM ' . TABLE_PREFIX . 'FormFields
 						WHERE (FormId = ' . $form_info['FormId'] . ') AND (EmailCommunicationRole > 0)';
 				$form_fields = $this->Conn->Query($sql, 'EmailCommunicationRole');
 
 				// what roles are filled from what fields
 				$role_mapping = Array (
 					SubmissionFormField::COMMUNICATION_ROLE_EMAIL => 'FromEmail',
 					SubmissionFormField::COMMUNICATION_ROLE_NAME => 'FromName',
 					SubmissionFormField::COMMUNICATION_ROLE_SUBJECT => 'Subject',
 					SubmissionFormField::COMMUNICATION_ROLE_BODY => 'Message',
 				);
 
 				$submission_fields = Array ();
 
 				foreach ($role_mapping as $role => $email_field) {
 					if ( array_key_exists($role, $form_fields) ) {
 						$submission_fields['fld_' . $form_fields[$role]['FormFieldId']] = $fields_hash[$email_field];
 					}
 				}
 
 				if ( $submission_fields ) {
 					// remove object, because it's linked to single form upon creation forever
 					$this->Application->removeObject('formsubs.-item');
 
+					/** @var kDBItem $form_submission */
 					$form_submission = $this->Application->recallObject('formsubs.-item', null, Array ('skip_autoload' => true));
-					/* @var $form_submission kDBItem */
 
 					// in case that other non-role mapped fields are required
 					$form_submission->IgnoreValidation = true;
 					$form_submission->SetDBFieldsFromHash($submission_fields);
 					$form_submission->SetDBField('FormId', $form_id);
 					$form_submission->SetDBField('MessageId', $fields_hash['MessageId']);
 					$form_submission->SetDBField('SubmissionTime_date', time());
 					$form_submission->SetDBField('SubmissionTime_time', time());
 					$form_submission->SetDBField('ReferrerURL', $this->Application->Phrase('la_Text_Email'));
 
 					return $form_submission->Create();
 				}
 			}
 
 			return false;
 		}
 
 		$submission_log_config = $this->Application->getUnitConfig('submission-log');
 
 		$sql = 'SELECT ' . $submission_log_config->getIDField() . '
 				FROM ' . $submission_log_config->getTableName() . '
 				WHERE MessageId = ' . $this->Conn->qstr($fields_hash['MessageId']);
 		$found = $this->Conn->GetOne($sql);
 
 		if ( $found ) {
 			// don't process same message twice
 			return false;
 		}
 
+		/** @var kDBItem $reply_to */
 		$reply_to = $this->Application->recallObject('submission-log.-reply-to', null, Array ('skip_autoload' => true));
-		/* @var $reply_to kDBItem */
 
 		$reply_to->Load($regs[2], 'VerifyCode');
 
 		if ( !$reply_to->isLoaded() ) {
 			// fake verification code OR feedback, containing submission log was deleted
 			return false;
 		}
 
 		if ( $params['bounce_mode'] ) {
 			// mark original message as bounced
 			$reply_to->SetDBField('BounceInfo', $fields_hash['Message']);
 			$reply_to->SetDBField('BounceDate_date', TIMENOW);
 			$reply_to->SetDBField('BounceDate_time', TIMENOW);
 			$reply_to->SetDBField('SentStatus', SUBMISSION_LOG_BOUNCE);
 			$reply_to->Update();
 
 			return true;
 		}
 
+		/** @var kDBItem $reply */
 		$reply = $this->Application->recallObject('submission-log.-reply', null, Array ('skip_autoload' => true));
-		/* @var $reply kDBItem */
 
 		$reply->SetDBFieldsFromHash($fields_hash);
 		$reply->SetDBField('ReplyTo', $reply_to->GetID());
 		$reply->SetDBField('FormSubmissionId', $reply_to->GetDBField('FormSubmissionId'));
 		$reply->SetDBField('ToEmail', $params['recipient_email']);
 		$reply->SetDBField('Subject', $regs[1]); // save subject without verification code
 		$reply->SetDBField('SentStatus', SUBMISSION_LOG_SENT);
 
 		return $reply->Create();
 	}
 }
Index: branches/5.3.x/core/units/forms/form_fields/form_fields_tp.php
===================================================================
--- branches/5.3.x/core/units/forms/form_fields/form_fields_tp.php	(revision 16518)
+++ branches/5.3.x/core/units/forms/form_fields/form_fields_tp.php	(revision 16519)
@@ -1,61 +1,61 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class FormFieldsTagProcessor extends kDBTagProcessor{
 
 		function CustomInputName($params)
 		{
 			$object = $this->getObject($params);
 			$source_prefix = $this->Application->Parser->GetParam('SourcePrefix');
 
 			$source_tp = $this->Application->recallTagProcessor($source_prefix);
 			$params['name'] = 'fld_'.$object->GetDBField('FormFieldId');
 			if (isset($params['verify'])) $params['name'] .= '_verify';
 			return $source_tp->InputName($params);
 		}
 
 		function SubmissionTag($params)
 		{
 			$object = $this->getObject($params);
 
 			$params['field'] = 'fld_'.$object->GetDBField('FormFieldId');
 			$source_prefix = $this->Application->Parser->GetParam('SourcePrefix');
 
 			return $this->Application->ProcessParsedTag($source_prefix, $params['tag'], $params);
 		}
 
 		/**
 		 * Allows to modify block params & current list record before PrintList parses record
 		 *
 		 * @param kDBList $object
 		 * @param Array $block_params
 		 */
 		function PrepareListElementParams(&$object, &$block_params)
 		{
 			if (!array_key_exists('SourcePrefix', $block_params)) {
 				// don't have source prefix in administrative console
 				$object->SetDBField('DirectOptions', false);
 				return ;
 			}
 
+			/** @var kDBItem $submission */
 			$submission = $this->Application->recallObject( $block_params['SourcePrefix'] );
-			/* @var $submission kDBItem */
 
 			$options = $submission->GetFieldOptions('fld_' . $object->GetID());
 			$object->SetDBField('DirectOptions', array_key_exists('options', $options) ? $options['options'] : false);
 		}
 
 	}
\ No newline at end of file
Index: branches/5.3.x/core/units/forms/form_fields/form_field_eh.php
===================================================================
--- branches/5.3.x/core/units/forms/form_fields/form_field_eh.php	(revision 16518)
+++ branches/5.3.x/core/units/forms/form_fields/form_field_eh.php	(revision 16519)
@@ -1,52 +1,52 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2010 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class FormFieldEventHandler extends kDBEventHandler {
 
 		/**
 		 * Returns form field visibility filter
 		 *
 		 * @return string
 		 */
 		function getVisiblilityFilter()
 		{
 			if ($this->Application->LoggedIn() && !$this->Application->isAdminUser) {
 				return '%1$s.Visibility = ' . SubmissionFormField::VISIBILITY_EVERYONE;
 			}
 
 			return '';
 		}
 
 		/**
 		 * Shows fields based on user logged-in status
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
 		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			$visibility_filter = $this->getVisiblilityFilter();
 
 			$object->addFilter('visibility_filter', $visibility_filter);
 		}
 	}
Index: branches/5.3.x/core/units/forms/submission_log/submission_log_tp.php
===================================================================
--- branches/5.3.x/core/units/forms/submission_log/submission_log_tp.php	(revision 16518)
+++ branches/5.3.x/core/units/forms/submission_log/submission_log_tp.php	(revision 16519)
@@ -1,117 +1,117 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class SubmissionLogTagProcessor extends kDBTagProcessor {
 
 		/**
 		 * Checks, that current log record is mail from client to admin and it's not replied
 		 *
 		 * @param Array $params
 		 * @return bool
 		 */
 		function IsNewUserReply($params)
 		{
+			/** @var kDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBItem */
 
 			$user_reply = $this->IsUserReply($params);
 
 			return $user_reply && ($object->GetDBField('ReplyStatus') != SUBMISSION_LOG_REPLIED);
 		}
 
 		/**
 		 * Checks, that current log record is mail from client to admin
 		 *
 		 * @param Array $params
 		 * @return bool
 		 */
 		function IsUserReply($params)
 		{
+			/** @var kDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBItem */
 
+			/** @var FormSubmissionHelper $form_submission_helper */
 			$form_submission_helper = $this->Application->recallObject('FormSubmissionHelper');
-			/* @var $form_submission_helper FormSubmissionHelper */
 
 			$form_submission = $form_submission_helper->getSubmissionFromLog($object);
 			$form =& $form_submission_helper->getForm($form_submission);
 
 			return $object->GetDBField('ToEmail') == $form->GetDBField('ReplyFromEmail');
 		}
 
 		/**
 		 * Checks if there is draft for given article
 		 *
 		 * @param Array $params
 		 * @return bool
 		 */
 		function HasDraft($params)
 		{
 			if (!$this->IsNewItem($params)) {
 				// use drafts only for unsent (new) messages
 				return false;
 			}
 
+			/** @var kDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBItem */
 
+			/** @var kDBItem $draft */
 			$draft = $this->Application->recallObject('draft', null, Array('skip_autoload' => true));
-			/* @var $draft kDBItem */
 
 			$load_keys = Array (
 				'FormSubmissionId' => $object->GetDBField('FormSubmissionId'),
 				'CreatedById' => $this->Application->RecallVar('user_id'),
 			);
 
 			// get existing draft for given submission and user
 			$draft->Load($load_keys);
 
 			return $draft->isLoaded();
 		}
 
 		/**
 		 * Lists all files, uploadeded to given field
 		 *
 		 * @param Array $params
 		 * @return string
 		 */
 		function IterateFiles($params)
 		{
+			/** @var kDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBItem */
 
 			$field = $this->SelectParam($params, 'name,field');
 			$value = $object->GetDBField($field);
 
 			if (!$value) {
 				return '';
 			}
 
 			$ret = '';
 			$files = explode('|', $value);
 			$block_params = $this->prepareTagParams($params);
 			$block_params['name'] = $params['render_as'];
 
 			foreach ($files as $file) {
 				$object->SetDBField($field, $file);
 				$ret .= $this->Application->ParseBlock($block_params);
 			}
 
 			$object->SetDBField($field, $value);
 
 			return $ret;
 		}
 	}
\ No newline at end of file
Index: branches/5.3.x/core/units/forms/submission_log/submission_log_eh.php
===================================================================
--- branches/5.3.x/core/units/forms/submission_log/submission_log_eh.php	(revision 16518)
+++ branches/5.3.x/core/units/forms/submission_log/submission_log_eh.php	(revision 16519)
@@ -1,690 +1,690 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class SubmissionLogEventHandler extends kDBEventHandler {
 
 		/**
 		 * Allows to override standard permission mapping
 		 *
 		 * @return void
 		 * @access protected
 		 * @see kEventHandler::$permMapping
 		 */
 		protected function mapPermissions()
 		{
 			parent::mapPermissions();
 
 			$permissions = Array (
 				'OnResendReply' => Array ('subitem' => 'add|edit'),
 				'OnSaveDraft' => Array ('subitem' => 'add|edit'),
 				'OnUseDraft' => Array ('subitem' => 'add|edit'),
 				'OnDeleteDraft' => Array ('subitem' => 'add|edit'),
 
 				'OnProcessBounceMail' => Array ('subitem' => true),
 			);
 
 			$this->permMapping = array_merge($this->permMapping, $permissions);
 		}
 
 		/**
 		 * Checks user permission to execute given $event
 		 *
 		 * @param kEvent $event
 		 * @return bool
 		 * @access public
 		 */
 		public function CheckPermission(kEvent $event)
 		{
 			$section = $event->getSection();
 			$form_id = $this->Application->GetVar('form_id');
 
 			if ( $form_id ) {
 				// copy form_id to env to be passed info upload links
 				$this->Application->SetVar($event->getPrefixSpecial() . '_form_id', $form_id);
 			}
 			else {
 				$form_id = $this->Application->GetVar($event->getPrefixSpecial() . '_form_id');
 			}
 
 			$event->setEventParam('PermSection', $section . ':' . $form_id);
 
 			return parent::CheckPermission($event);
 		}
 
 		/**
 		 * Prepares new kDBItem object
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnNew(kEvent $event)
 		{
 			parent::OnNew($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
+			/** @var kDBItem $form_submission */
 			$form_submission = $this->Application->recallObject('formsubs');
-			/* @var $form_submission kDBItem */
 
+			/** @var FormSubmissionHelper $form_submission_helper */
 			$form_submission_helper = $this->Application->recallObject('FormSubmissionHelper');
-			/* @var $form_submission_helper FormSubmissionHelper */
 
+			/** @var kDBItem $form */
 			$form =& $form_submission_helper->getForm($form_submission);
-			/* @var $form kDBItem */
 
 			$from_email = $form->GetDBField('ReplyFromEmail');
 			$to_email = $form_submission_helper->getFieldByRole($form_submission, SubmissionFormField::COMMUNICATION_ROLE_EMAIL);
 
 			if ( $this->Application->GetVar('client_mode') ) {
 				// debug code for sending email from client
 				$object->SetDBField('FromEmail', $to_email);
 				$object->SetDBField('ToEmail', $from_email);
 
 			}
 			else {
 				$object->SetDBField('FromEmail', $from_email);
 				$object->SetDBField('ToEmail', $to_email);
 			}
 
 			$object->SetDBField('Cc', $form->GetDBField('ReplyCc'));
 			$object->SetDBField('Bcc', $form->GetDBField('ReplyBcc'));
 
 			$ids = $this->StoreSelectedIDs($event);
 			if ( $ids ) {
+				/** @var kDBItem $org_message */
 				$org_message = $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true));
-				/* @var $org_message kDBItem */
 
 				$org_message->Load(array_shift($ids));
 				// client could reply from different email, so compare to admin email!
 				if ( $org_message->GetDBField('ToEmail') == $from_email ) {
 					// can reply only to client email, not own :)
 
 					// transform subject
 					$message_subject = $org_message->GetDBField('Subject');
 
 					if ( $message_subject ) {
 						$object->SetDBField('Subject', $this->_transformSubject($message_subject, 'Re'));
 					}
 
 					// add signature
 					$message_body = $form->GetDBField('ReplyMessageSignature');
 
 					if ( $org_message->GetDBField('Message') ) {
 						// add replied marks
 						$message_body .= '> ' . preg_replace('/([\r]*\n)/', '\\1> ', $org_message->GetDBField('Message'));
 					}
 
 					$object->SetDBField('ToEmail', $org_message->GetDBField('FromEmail')); // user client's email from reply
 					$object->SetDBField('Message', $message_body);
 					$object->SetDBField('ReplyTo', $org_message->GetID());
 				}
 			}
 			else {
 				$sql = 'SELECT COUNT(*)
 						FROM ' . $object->TableName . '
 						WHERE FormSubmissionId = ' . $form_submission->GetID();
 				$replies_found = $this->Conn->GetOne($sql);
 
 				if ( !$replies_found ) {
 					// 1st message from admin -> quote subject & text from feedback
 					$message_subject = $form_submission_helper->getFieldByRole($form_submission, SubmissionFormField::COMMUNICATION_ROLE_SUBJECT, true);
 
 					if ( $message_subject ) {
 						$object->SetDBField('Subject', $this->_transformSubject($message_subject, 'Re'));
 					}
 
 					// add signature
 					$message_body = $form->GetDBField('ReplyMessageSignature');
 
 					// add replied marks
 					$original_message_body = $form_submission_helper->getFieldByRole($form_submission, SubmissionFormField::COMMUNICATION_ROLE_BODY);
 
 					if ( $original_message_body ) {
 						$message_body .= '> ' . preg_replace('/([\r]*\n)/', '\\1> ', $original_message_body);
 					}
 
 					$object->SetDBField('Message', $message_body);
 				}
 			}
 
 			$this->clearSelectedIDs($event);
 		}
 
 		/**
 		 * Parses $search string in subject and reformats it
 		 * Used for replying and forwarding
 		 *
 		 * @param string $subject
 		 * @param string $search
 		 * @return string
 		 */
 		function _transformSubject($subject, $search = 'Re')
 		{
 			$regex = '/'.$search.'(\[([\d]+)\]){0,1}:/i';
 			preg_match_all($regex, $subject, $regs);
 
 			if ($regs[2]) {
 				$reply_count = 0; // reply count without numbers (equals to "re[1]")
 				$max_reply_number = 0; // maximal reply number
 				sort($regs[2], SORT_NUMERIC); // sort ascending (non-numeric replies first)
 				foreach ($regs[2] as $match) {
 					if (!$match) {
 						// found "re:"
 						$reply_count++;
 					}
 					elseif ($match > $max_reply) {
 						// found "re:[number]"
 						$max_reply_number = $match;
 					}
 				}
 
 				return $search.'['.($reply_count + $max_reply_number + 1).']: '.trim(preg_replace($regex, '', $subject));
 			}
 
 			return $search.': '.$subject;
 		}
 
 		/**
 		 * Resends reply, that was not sent last time
 		 *
 		 * @param kEvent $event
 		 */
 		function OnResendReply($event)
 		{
 			$ids = $this->StoreSelectedIDs($event);
 
 			if (!$ids) {
 				return ;
 			}
 
+			/** @var kDBItem $object */
 			$object = $event->getObject( Array('skip_autoload' => true) );
-			/* @var $object kDBItem */
 
 			$sql = 'SELECT f.ReplyFromEmail, sl.' . $object->IDField . '
 					FROM ' . $object->TableName . ' sl
 					JOIN ' . $this->Application->getUnitConfig('formsubs')->getTableName() . ' fs ON fs.FormSubmissionId = sl.FormSubmissionId
 					JOIN ' . $this->Application->getUnitConfig('form')->getTableName() . ' f ON f.FormId = fs.FormId
 					WHERE sl.' . $object->IDField . ' IN (' . implode(',', $ids) . ')';
 			$reply_emails = $this->Conn->GetCol($sql, $object->IDField);
 
 			foreach ($ids as $id) {
 				$object->Load($id);
 
 				// allow to send messages, that were successfully sended before :(
 				if (($object->GetDBField('ToEmail') != $reply_emails[$id]) && ($object->GetDBField('SentStatus') != SUBMISSION_LOG_SENT)) {
 					$object->SetOriginalField('SentStatus', 0); // reset sent status to update sent date automatically
 
 					$this->_sendEmail($object); // resend email here
 				}
 			}
 
 			$this->clearSelectedIDs($event);
 
 			if (!$this->Application->GetVar('from_list')) {
 				$event->SetRedirectParam('opener', 'u');
 			}
 		}
 
 		/**
 		 * Updates last operation dates for log record
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemCreate(kEvent $event)
 		{
 			parent::OnBeforeItemCreate($event);
 
 			$this->_validateRecipients($event);
 			$this->_updateStatusDates($event);
 		}
 
 		/**
 		 * Updates last operation dates for log record
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemUpdate(kEvent $event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
 			$this->_validateRecipients($event);
 			$this->_updateStatusDates($event);
 		}
 
 		/**
 		 * Validates email recipients
 		 *
 		 * @param kEvent $event
 		 */
 		function _validateRecipients($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
+			/** @var kEmailSendingHelper $esender */
 			$esender = $this->Application->recallObject('EmailSender');
-			/* @var $esender kEmailSendingHelper */
 
 			$cc = $object->GetDBField('Cc');
 
 			if ($cc && ($esender->GetRecipients($cc) === false)) {
 				$object->SetError('Cc', 'invalid_format');
 			}
 
 			$bcc = $object->GetDBField('Bcc');
 
 			if ($bcc && ($esender->GetRecipients($bcc) === false)) {
 				$object->SetError('Bcc', 'invalid_format');
 			}
 		}
 
 		/**
 		 * Generates verification code and sets it inside sent message
 		 *
 		 * @param kDBItem $object
 		 * @return string
 		 */
 		function _generateVerificationCode(&$object)
 		{
 			$code = Array (
 				$object->GetDBField('FromEmail'),
 				$object->GetDBField('ToEmail'),
 				$object->GetID(),
 				microtime(true)
 			);
 
 			$object->SetDBField('VerifyCode', md5( implode('-', $code) ));
 		}
 
 		/**
 		 * Sends email based on fields from given submission-log record
 		 *
 		 * @param kDBItem $object
 		 */
 		function _sendEmail(&$object)
 		{
 			if ($this->Application->GetVar('client_mode')) {
 				return ;
 			}
 
 			if (!$object->GetDBField('VerifyCode')) {
 				$this->_generateVerificationCode($object);
 			}
 
+			/** @var FormSubmissionHelper $form_submission_helper */
 			$form_submission_helper = $this->Application->recallObject('FormSubmissionHelper');
-			/* @var $form_submission_helper FormSubmissionHelper */
 
 			$form_submission = $form_submission_helper->getSubmissionFromLog($object);
 			$form =& $form_submission_helper->getForm($form_submission);
 
 			$send_params = Array (
 				'from_name' => $form->GetDBField('ReplyFromName'),
 				'from_email' => $object->GetDBField('FromEmail'),
 
 				'to_email' => $object->GetDBField('ToEmail'),
 
 				'subject' => $object->GetDBField('Subject'),
 				'message' => $object->GetDBField('Message'),
 			);
 
 			$to_name = $form_submission_helper->getFieldByRole($form_submission, SubmissionFormField::COMMUNICATION_ROLE_NAME);
 
 			if ($to_name) {
 				$send_params['to_name'] = $to_name;
 			}
 
+			/** @var kEmailSendingHelper $esender */
 			$esender = $this->Application->recallObject('EmailSender');
-			/* @var $esender kEmailSendingHelper */
 
 			$esender->SetReturnPath( $form->GetDBField('BounceEmail') );
 
 			if ($object->GetDBField('Cc')) {
 				$recipients = $esender->GetRecipients( $object->GetDBField('Cc') );
 
 				foreach ($recipients as $recipient_info) {
 					$esender->AddCc($recipient_info['Email'], $recipient_info['Name']);
 				}
 			}
 
 			if ($object->GetDBField('Bcc')) {
 				$recipients = $esender->GetRecipients( $object->GetDBField('Bcc') );
 
 				foreach ($recipients as $recipient_info) {
 					$esender->AddBcc($recipient_info['Email'], $recipient_info['Name']);
 				}
 			}
 
 			if ($object->GetDBField('Attachment')) {
 				$attachments = explode('|', $object->GetField('Attachment', 'file_paths'));
 
 				foreach ($attachments as $attachment) {
 					$esender->AddAttachment($attachment);
 				}
 			}
 
 			$this->Application->emailAdmin('FORM.SUBMISSION.REPLY.TO.USER', null, $object->getEmailParams($send_params));
 
 			// mark as sent after sending is finished
 			$object->SetDBField('SentStatus', SUBMISSION_LOG_SENT);
 
 			// reset bounce status before (re-)sending
 			$object->SetDBField('BounceInfo', NULL);
 			$object->SetDBField('BounceDate_date', NULL);
 			$object->SetDBField('BounceDate_time', NULL);
 
 			if ($object->GetDBField('DraftId')) {
+				/** @var kTempTablesHandler $temp_handler */
 				$temp_handler = $this->Application->recallObject('draft_TempHandler', 'kTempTablesHandler');
-				/* @var $temp_handler kTempTablesHandler */
 
 				$temp_handler->DeleteItems('draft', '', Array ($object->GetDBField('DraftId')));
 				$object->SetDBField('DraftId', 0);
 			}
 
 			$object->Update();
 		}
 
 		/**
 		 * Sends new email after log record was created
 		 * Updates last update time for submission
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemCreate(kEvent $event)
 		{
 			parent::OnAfterItemCreate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$this->_sendEmail($object); // send email
 
 			$this->_updateSubmission($event);
 
 			$reply_to = $object->GetDBField('ReplyTo');
 			if ( !$reply_to ) {
 				$reply_to = $this->_getLastMessageId($event, !$this->Application->GetVar('client_mode'));
 			}
 
 			if ( $reply_to ) {
 				// this is reply to other message -> mark it as replied
+				/** @var kDBItem $org_message */
 				$org_message = $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true));
-				/* @var $org_message kDBItem */
 
 				$org_message->Load($reply_to);
 				$org_message->SetDBField('ReplyStatus', SUBMISSION_LOG_REPLIED);
 				$org_message->Update();
 			}
 
 			if ( $this->Application->GetVar('client_mode') ) {
 				// new reply from client received -> send notification about it
 				$this->Application->emailAdmin('FORM.SUBMISSION.REPLY.FROM.USER', null, $object->getEmailParams());
 			}
 		}
 
 		/**
 		 * Returns last message id (client OR admin)
 		 *
 		 * @param kEvent $event
 		 * @param bool $from_client
 		 * @return int
 		 */
 		function _getLastMessageId($event, $from_client = false)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
+			/** @var FormSubmissionHelper $form_submission_helper */
 			$form_submission_helper = $this->Application->recallObject('FormSubmissionHelper');
-			/* @var $form_submission_helper FormSubmissionHelper */
 
 			$form_submission = $form_submission_helper->getSubmissionFromLog($object);
 
 			$form =& $form_submission_helper->getForm($form_submission);
 			$reply_email = $form->GetDBField('ReplyFromEmail');
 
 			$sql = 'SELECT MAX(' . $object->IDField . ')
 					FROM ' . $object->TableName . '
 					WHERE (FormSubmissionId = ' . $form_submission->GetID() . ') AND (ToEmail' . ($from_client ? ' = ' : ' <> ') . $this->Conn->qstr($reply_email) . ')';
 			return $this->Conn->GetOne($sql);
 		}
 
 		/**
 		 * Updates last update time for submission
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemUpdate(kEvent $event)
 		{
 			parent::OnAfterItemUpdate($event);
 
 			$this->_updateSubmission($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			// send out email event to admin for bouncing
 			$sent_status = $object->GetDBField('SentStatus');
 
 			if ( $object->GetOriginalField('SentStatus') != $sent_status && $sent_status == SUBMISSION_LOG_BOUNCE ) {
 				$this->Application->emailAdmin('FORM.SUBMISSION.REPLY.FROM.USER.BOUNCED', null, $object->getEmailParams());
 			}
 		}
 
 		/**
 		 * Sets last sent/reply dates based on field changes in log record
 		 *
 		 * @param kEvent $event
 		 */
 		function _updateStatusDates($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$now = time();
 
 			$sent_status = $object->GetDBField('SentStatus');
 			if (($event->Special != 'merge') && ($sent_status == SUBMISSION_LOG_SENT) && ($sent_status != $object->GetOriginalField('SentStatus'))) {
 				// sent status was set
 				$object->SetDBField('SentOn_date', $now);
 				$object->SetDBField('SentOn_time', $now);
 			}
 
 			$reply_status = $object->GetDBField('ReplyStatus');
 			if (($reply_status == SUBMISSION_LOG_REPLIED) && ($reply_status != $object->GetOriginalField('ReplyStatus'))) {
 				// sent status was set
 				$object->SetDBField('RepliedOn_date', $now);
 				$object->SetDBField('RepliedOn_time', $now);
 			}
 		}
 
 		/**
 		 * Sets last updated field for form submission
 		 *
 		 * @param kEvent $event
 		 */
 		function _updateSubmission($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
+			/** @var FormSubmissionHelper $form_submission_helper */
 			$form_submission_helper = $this->Application->recallObject('FormSubmissionHelper');
-			/* @var $form_submission_helper FormSubmissionHelper */
 
 			$form_submission = $form_submission_helper->getSubmissionFromLog($object);
 
 			// 1. set last updated
 			$last_updated = max ($object->GetDBField('SentOn'), $object->GetDBField('RepliedOn'));
 
 			if ($form_submission->GetDBField('LastUpdatedOn') < $last_updated) {
 				// don't set smaller last update, that currenly set
 				$form_submission->SetDBField('LastUpdatedOn_date', $last_updated);
 				$form_submission->SetDBField('LastUpdatedOn_time', $last_updated);
 			}
 
 			// 2. update submission status
 			$form =& $form_submission_helper->getForm($form_submission);
 			$client_responce = $form->GetDBField('ReplyFromEmail') == $object->GetDBField('ToEmail');
 			$replied = $object->GetDBField('ReplyStatus') == SUBMISSION_LOG_REPLIED;
 
 			if (!$client_responce && !$replied) {
 				 // admin sends new email to client
 				 $form_submission->SetDBField('LogStatus', SUBMISSION_REPLIED);
 			}
 			elseif ($client_responce) {
 				// client email becomes replied OR receiving new unreplied email from client
 				$form_submission->SetDBField('LogStatus', $replied ?  SUBMISSION_REPLIED : SUBMISSION_NEW_EMAIL);
 			}
 
 			if ($object->GetDBField('SentStatus') == SUBMISSION_LOG_BOUNCE) {
 				// propagate bounce status from reply
 				$form_submission->SetDBField('LogStatus', SUBMISSION_BOUNCE);
 			}
 
 			$form_submission->Update();
 		}
 
 		/**
 		 * Saves current unsent message as draft
 		 *
 		 * @param kEvent $event
 		 */
 		function OnSaveDraft($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject( Array('skip_autoload' => true) );
-			/* @var $object kDBItem */
 
+			/** @var kDBItem $draft */
 			$draft = $this->Application->recallObject('draft', null, Array('skip_autoload' => true));
-			/* @var $draft kDBItem */
 
 			$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
 			if ($items_info) {
 				foreach ($items_info as $id => $field_values) {
 					$object->setID($id);
 	 				$object->SetFieldsFromHash($field_values);
 					$event->setEventParam('form_data', $field_values);
 
 	 				$load_keys = Array (
 	 					'FormSubmissionId' => $object->GetDBField('FormSubmissionId'),
 	 					'CreatedById' => $this->Application->RecallVar('user_id'),
 	 				);
 
 	 				// get existing draft for given submission and user
 	 				$draft->Load($load_keys);
 
 	 				$draft->SetDBField('Message', $object->GetDBField('Message'));
 
 	 				if ($draft->isLoaded()) {
 	 					$draft->Update();
 	 				}
 	 				else {
 	 					$draft->SetDBFieldsFromHash($load_keys);
 	 					$draft->Create();
 	 				}
 				}
 			}
 
 			$this->Application->SetVar($event->getPrefixSpecial() . '_SaveEvent', 'OnCreate');
 			$event->SetRedirectParam('opener', 'u');
 		}
 
 		/**
 		 * Uses found draft instead of submission reply body
 		 *
 		 * @param kEvent $event
 		 */
 		function OnUseDraft($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject( Array('skip_autoload' => true) );
-			/* @var $object kDBItem */
 
+			/** @var kDBItem $draft */
 			$draft = $this->Application->recallObject('draft', null, Array('skip_autoload' => true));
-			/* @var $draft kDBItem */
 
 			$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
 			if ($items_info) {
 				foreach ($items_info as $id => $field_values) {
 					$object->setID($id);
 	 				$object->SetFieldsFromHash($field_values);
 					$event->setEventParam('form_data', $field_values);
 
 	 				$load_keys = Array (
 	 					'FormSubmissionId' => $object->GetDBField('FormSubmissionId'),
 	 					'CreatedById' => $this->Application->RecallVar('user_id'),
 	 				);
 
 	 				// get existing draft for given submission and user
 	 				$draft->Load($load_keys);
 					if ($draft->isLoaded()) {
 						$object->SetDBField('Message', $draft->GetDBField('Message'));
 						$object->SetDBField('DraftId', $draft->GetID());
 					}
 				}
 			}
 
 			$this->Application->SetVar($event->getPrefixSpecial() . '_SaveEvent', 'OnCreate');
 			$event->redirect = false;
 		}
 
 		/**
 		 * Deletes draft, that matches given user and form submission
 		 *
 		 * @param kEvent $event
 		 */
 		function OnDeleteDraft($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject( Array('skip_autoload' => true) );
-			/* @var $object kDBItem */
 
+			/** @var kDBItem $draft */
 			$draft = $this->Application->recallObject('draft', null, Array('skip_autoload' => true));
-			/* @var $draft kDBItem */
 
 			$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
 			if ($items_info) {
 				foreach ($items_info as $id => $field_values) {
 					$object->setID($id);
 	 				$object->SetFieldsFromHash($field_values);
 					$event->setEventParam('form_data', $field_values);
 
 					$object->SetDBField('DraftId', 0);
 
 	 				$load_keys = Array (
 	 					'FormSubmissionId' => $object->GetDBField('FormSubmissionId'),
 	 					'CreatedById' => $this->Application->RecallVar('user_id'),
 	 				);
 
 	 				// get existing draft for given submission and user
 	 				$draft->Load($load_keys);
 					if ($draft->isLoaded()) {
+						/** @var kTempTablesHandler $temp_handler */
 						$temp_handler = $this->Application->recallObject('draft_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
-						/* @var $temp_handler kTempTablesHandler */
 
 						$temp_handler->DeleteItems('draft', '', Array ($draft->GetID()));
 					}
 				}
 			}
 
 			$this->Application->SetVar($event->getPrefixSpecial() . '_SaveEvent', 'OnCreate');
 			$event->redirect = false;
 		}
 	}
Index: branches/5.3.x/core/units/admin/admin_events_handler.php
===================================================================
--- branches/5.3.x/core/units/admin/admin_events_handler.php	(revision 16518)
+++ branches/5.3.x/core/units/admin/admin_events_handler.php	(revision 16519)
@@ -1,1420 +1,1420 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class AdminEventsHandler extends kDBEventHandler {
 
 	/**
 	 * Allows to override standard permission mapping
 	 *
 	 * @return void
 	 * @access protected
 	 * @see kEventHandler::$permMapping
 	 */
 	protected function mapPermissions()
 	{
 		parent::mapPermissions();
 
 		$permissions = Array (
 			'OnSaveColumns' => Array ('self' => true),
 			'OnGetPopupSize' => Array ('self' => true),
 			'OnClosePopup' => Array ('self' => true),
 			'OnSaveSetting' => Array ('self' => true),
 			'OnDropTempTablesByWID' => Array ('self' => true),
 			'OnProcessSelected' => Array ('self' => true), // allow CSV import file upload
 		);
 
 		$this->permMapping = array_merge($this->permMapping, $permissions);
 	}
 
 	/**
 	 * Checks user permission to execute given $event
 	 *
 	 * @param kEvent $event
 	 * @return bool
 	 * @access public
 	 */
 	public function CheckPermission(kEvent $event)
 	{
 		$perm_value = null;
 
 		$system_events = Array (
 			'OnResetModRwCache', 'OnResetSections', 'OnResetConfigsCache', 'OnResetParsedData', 'OnResetMemcache',
 			'OnDeleteCompiledTemplates', 'OnCompileTemplates', 'OnGenerateTableStructure', 'OnSynchronizeDBRevisions',
 			'OnDeploy', 'OnRebuildThemes', 'OnCheckPrefixConfig', 'OnMemoryCacheGet', 'OnMemoryCacheSet'
 		);
 
 		if ( in_array($event->Name, $system_events) ) {
 			// events from "Tools -> System Tools" section are controlled via that section "edit" permission
 			$perm_value = /*$this->Application->isDebugMode() ||*/ $this->Application->CheckPermission($event->getSection() . '.edit');
 		}
 
 		$tools_events = Array (
 			'OnBackup' => 'in-portal:backup.view',
 			'OnBackupProgress' => 'in-portal:backup.view',
 			'OnDeleteBackup' => 'in-portal:backup.view',
 			'OnBackupCancel' => 'in-portal:backup.view',
 
 			'OnRestore' => 'in-portal:restore.view',
 			'OnRestoreProgress' => 'in-portal:restore.view',
 			'OnRestoreCancel' => 'in-portal:backup.view',
 
 			'OnSqlQuery' => 'in-portal:sql_query.view',
 		);
 
 		if ( array_key_exists($event->Name, $tools_events) ) {
 			$perm_value = $this->Application->CheckPermission($tools_events[$event->Name]);
 		}
 
 		if ( $event->Name == 'OnSaveMenuFrameWidth' ) {
 			$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);
 
 			$perm_mapping = Array (
 				'OnCSVImportBegin' => 'OnProcessSelected',
 				'OnCSVImportStep' => 'OnProcessSelected',
 				'OnExportCSV' => 'OnLoad',
 				'OnGetCSV' => 'OnLoad',
 			);
 
 			$tmp_event = new kEvent($prefix . ':' . $perm_mapping[$event->Name] );
 			$perm_value = $perm_helper->CheckEventPermission($tmp_event, $this->permMapping);
 		}
 
 		if ( isset($perm_value) ) {
 			return $perm_helper->finalizePermissionCheck($event, $perm_value);
 		}
 
 		return parent::CheckPermission($event);
 	}
 
 	/**
 	 * Reset mod-rewrite url cache
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnResetModRwCache(kEvent $event)
 	{
 		if ( $this->Application->GetVar('ajax') == 'yes' ) {
 			$event->status = kEvent::erSTOP;
 		}
 
 		$this->Conn->Query('DELETE FROM ' . TABLE_PREFIX . 'CachedUrls');
 
 		$event->SetRedirectParam('action_completed', 1);
 	}
 
 	/**
 	 * Resets tree section cache and refreshes admin section tree
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnResetSections(kEvent $event)
 	{
 		if ($this->Application->GetVar('ajax') == 'yes') {
 			$event->status = kEvent::erSTOP;
 		}
 
 		if ($this->Application->isCachingType(CACHING_TYPE_MEMORY)) {
 			$this->Application->rebuildCache('master:sections_parsed', kCache::REBUILD_LATER, CacheSettings::$sectionsParsedRebuildTime);
 		}
 		else {
 			$this->Application->rebuildDBCache('sections_parsed', kCache::REBUILD_LATER, CacheSettings::$sectionsParsedRebuildTime);
 		}
 
 		$event->SetRedirectParam('refresh_tree', 1);
 		$event->SetRedirectParam('action_completed', 1);
 	}
 
 	/**
 	 * Resets unit config cache
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnResetConfigsCache(kEvent $event)
 	{
 		if ( $this->Application->GetVar('ajax') == 'yes' ) {
 			$event->status = kEvent::erSTOP;
 		}
 
 		if ( $this->Application->isCachingType(CACHING_TYPE_MEMORY) ) {
 			$this->Application->rebuildCache('master:config_files', kCache::REBUILD_LATER, CacheSettings::$unitCacheRebuildTime);
 		}
 		else {
 			$this->Application->rebuildDBCache('config_files', kCache::REBUILD_LATER, CacheSettings::$unitCacheRebuildTime);
 		}
 
 		$this->OnResetParsedData($event);
 
+		/** @var SkinHelper $skin_helper */
 		$skin_helper = $this->Application->recallObject('SkinHelper');
-		/* @var $skin_helper SkinHelper */
 
 		$skin_helper->deleteCompiled();
 	}
 
 	/**
 	 * Resets parsed data from unit configs
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnResetParsedData(kEvent $event)
 	{
 		if ( $this->Application->GetVar('ajax') == 'yes' ) {
 			$event->status = kEvent::erSTOP;
 		}
 
 		$this->Application->DeleteUnitCache();
 
 		if ( $this->Application->GetVar('validate_configs') ) {
 			$event->SetRedirectParam('validate_configs', 1);
 		}
 
 		$event->SetRedirectParam('action_completed', 1);
 	}
 
 	/**
 	 * Resets memory cache
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnResetMemcache(kEvent $event)
 	{
 		if ($this->Application->GetVar('ajax') == 'yes') {
 			$event->status = kEvent::erSTOP;
 		}
 
 		$this->Application->resetCache();
 		$event->SetRedirectParam('action_completed', 1);
 	}
 
 	/**
 	 * Compiles all templates (with a progress bar)
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnCompileTemplates(kEvent $event)
 	{
+		/** @var NParserCompiler $compiler */
 		$compiler = $this->Application->recallObject('NParserCompiler');
-		/* @var $compiler NParserCompiler */
 
 		$compiler->CompileTemplatesStep();
 		$event->status = kEvent::erSTOP;
 	}
 
 	/**
 	 * Deletes all compiled templates
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnDeleteCompiledTemplates(kEvent $event)
 	{
 		if ( $this->Application->GetVar('ajax') == 'yes' ) {
 			$event->status = kEvent::erSTOP;
 		}
 
 		$base_path = WRITEABLE . DIRECTORY_SEPARATOR . 'cache';
 
 		// delete debugger reports
 		$debugger_reports = glob(RESTRICTED . '/debug_@*@.txt');
 
 		if ( $debugger_reports ) {
 			foreach ($debugger_reports as $debugger_report) {
 				unlink($debugger_report);
 			}
 		}
 
 		$this->_deleteCompiledTemplates($base_path);
 		$event->SetRedirectParam('action_completed', 1);
 	}
 
 	/**
 	 * Deletes compiled templates in a given folder
 	 *
 	 * @param string $folder
 	 * @param bool $unlink_folder
 	 * @return void
 	 * @access protected
 	 */
 	protected function _deleteCompiledTemplates($folder, $unlink_folder = false)
 	{
 		$sub_folders = glob($folder . '/*', GLOB_ONLYDIR);
 
 		if ( is_array($sub_folders) ) {
 			foreach ($sub_folders as $sub_folder) {
 				$this->_deleteCompiledTemplates($sub_folder, true);
 			}
 		}
 
 		$files = glob($folder . '/*.php');
 
 		if ( is_array($files) ) {
 			foreach ($files as $file) {
 				unlink($file);
 			}
 		}
 
 		if ( $unlink_folder ) {
 			rmdir($folder);
 		}
 	}
 
 	/**
 	 * Generates structure for specified table
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnGenerateTableStructure(kEvent $event)
 	{
 		$types_hash = Array (
 			'string'	=>	'varchar|text|mediumtext|longtext|date|datetime|time|timestamp|char|year|enum|set',
 			'int'		=>	'smallint|mediumint|int|bigint|tinyint',
 			'float'		=>	'float|double|decimal',
 		);
 
 		$table_name = $this->Application->GetVar('table_name');
 		if ( !$table_name ) {
 			echo 'error: no table name specified';
 			return;
 		}
 
 		if ( TABLE_PREFIX && !preg_match('/^' . preg_quote(TABLE_PREFIX, '/') . '(.*)/', $table_name) && (strtolower($table_name) != $table_name) ) {
 			// table name without prefix, then add it (don't affect K3 tables named in lowercase)
 			$table_name = TABLE_PREFIX . $table_name;
 		}
 
 		if ( !$this->Conn->TableFound($table_name) ) {
 			// table with prefix doesn't exist, assume that just config prefix passed -> resolve table name from it
 			$prefix = preg_replace('/^' . preg_quote(TABLE_PREFIX, '/') . '/', '', $table_name);
 			if ( $this->Application->prefixRegistred($prefix) ) {
 				// when prefix is found -> use it's table (don't affect K3 tables named in lowecase)
 				$table_name = $this->Application->getUnitConfig($prefix)->getTableName();
 			}
 		}
 
 		$table_info = $this->Conn->Query('DESCRIBE '.$table_name);
 
 		// 1. prepare config keys
 		$grids = Array (
 			'Default' => Array (
 				'Icons' => Array ('default' => 'icon16_item.png'),
 				'Fields' => Array (),
 			)
 		);
 
 		$grids_fields = Array();
 
 		$id_field = '';
 		$fields = Array ();
 		$float_types = Array ('float', 'double', 'numeric');
 		foreach ($table_info as $field_info) {
 			if ( preg_match('/l[\d]+_.*/', $field_info['Field']) ) {
 				// don't put multilingual fields in config
 				continue;
 			}
 
 			$field_options = Array ();
 
 			if ( $field_info['Key'] == 'PRI' ) {
 				if ( $field_info['Field'] == 'Id' ) {
 					$grid_col_options = Array ('filter_block' => 'grid_range_filter', 'width' => 80);
 				}
 				else {
 					$grid_col_options = Array ('title' => 'column:la_fld_Id', 'filter_block' => 'grid_range_filter', 'width' => 80);
 				}
 			}
 			else {
 				$grid_col_options = Array ('filter_block' => 'grid_like_filter');
 			}
 
 			// 1. get php field type by mysql field type
 			foreach ($types_hash as $php_type => $db_types) {
 				if ( preg_match('/' . $db_types . '/', $field_info['Type']) ) {
 					$field_options['type'] = $php_type;
 					break;
 				}
 			}
 
 			// 2. get field default value
 			$default_value = $field_info['Default'];
 			$not_null = $field_info['Null'] != 'YES';
 
 			if ( is_numeric($default_value) ) {
 				$default_value = preg_match('/[\.,]/', $default_value) ? (float)$default_value : (int)$default_value;
 			}
 
 			if ( is_null($default_value) && $not_null ) {
 				$default_value = $field_options['type'] == 'string' ? '' : 0;
 			}
 
 			if ( in_array($php_type, $float_types) ) {
 				// this is float number
 				if ( preg_match('/' . $db_types . '\([\d]+,([\d]+)\)/i', $field_info['Type'], $regs) ) {
 					// size is described in structure -> add formatter
 					$field_options['formatter'] = 'kFormatter';
 					$field_options['format'] = '%01.' . $regs[1] . 'f';
 
 					if ( $not_null ) {
 						// null fields, will most likely have NULL as default value
 						$default_value = 0;
 					}
 				}
 				elseif ( $not_null ) {
 					// no size information, just convert to float
 					// null fields, will most likely have NULL as default value
 					$default_value = (float)$default_value;
 				}
 			}
 
 			if ( preg_match('/varchar\(([\d]+)\)/i', $field_info['Type'], $regs) ) {
 				$field_options['max_len'] = (int)$regs[1];
 			}
 
 			if ( preg_match('/tinyint\([\d]+\)/i', $field_info['Type']) ) {
 				$field_options['formatter'] = 'kOptionsFormatter';
 				$field_options['options'] = Array (1 => 'la_Yes', 0 => 'la_No');
 				$field_options['use_phrases'] = 1;
 				$grid_col_options['filter_block'] = 'grid_options_filter';
 			}
 
 			if ( $not_null ) {
 				$field_options['not_null'] = 1;
 			}
 
 			if ( $field_info['Key'] == 'PRI' ) {
 				$default_value = 0;
 				$id_field = $field_info['Field'];
 			}
 
 			if ( $php_type == 'int' && !$not_null ) {
 				// numeric null field
 				if ( preg_match('/(On|Date)$/', $field_info['Field']) || $field_info['Field'] == 'Modified' ) {
 					$field_options['formatter'] = 'kDateFormatter';
 					$grid_col_options['filter_block'] = 'grid_date_range_filter';
 					$grid_col_options['width'] = 120;
 				}
 				else {
 					$grid_col_options['filter_block'] = 'grid_range_filter';
 					$grid_col_options['width'] = 80;
 				}
 			}
 
 			if ( $php_type == 'int' && ($not_null || is_numeric($default_value)) ) {
 				// is integer field AND not null
 				$field_options['default'] = (int)$default_value;
 			}
 			else {
 				$field_options['default'] = $default_value;
 			}
 
 			$fields[$field_info['Field']] = $field_options;
 			$grids_fields[$field_info['Field']] = $grid_col_options;
 		}
 
 		$grids['Default']['Fields'] = $grids_fields;
 
 		$ret = Array (
 			'IDField' => $id_field,
 			'Fields' => $fields,
 			'Grids' => $grids,
 		);
 
 		$decorator = new UnitConfigDecorator();
 		$ret = $decorator->decorate($ret);
 
 		$this->Application->InitParser();
 		ob_start();
 		echo $this->Application->ParseBlock(Array('name' => 'incs/header', 'body_properties' => 'style="background-color: #E7E7E7; margin: 8px;"'));
 	?>
 		<script type="text/javascript">
 			set_window_title('Table "<?php echo $table_name; ?>" Structure');
 		</script>
 
 		<a href="javascript:window_close();">Close Window</a><br /><br />
 		<?php echo $GLOBALS['debugger']->highlightString($ret); ?>
 		<br /><br /><a href="javascript:window_close();">Close Window</a><br />
 	<?php
 		echo $this->Application->ParseBlock(Array('name' => 'incs/footer'));
 		echo ob_get_clean();
 		$event->status = kEvent::erSTOP;
 	}
 
 	/**
 	 * Refreshes ThemeFiles & Themes tables by actual content on HDD
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnRebuildThemes(kEvent $event)
 	{
 		if ( $this->Application->GetVar('ajax') == 'yes' ) {
 			$event->status = kEvent::erSTOP;
 		}
 
+		/** @var kThemesHelper $themes_helper */
 		$themes_helper = $this->Application->recallObject('ThemesHelper');
-		/* @var $themes_helper kThemesHelper */
 
 		$themes_helper->refreshThemes();
 
 		$event->SetRedirectParam('action_completed', 1);
 	}
 
 	/**
 	 * Saves grid column widths after their resize by user
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnSaveColumns(kEvent $event)
 	{
 		$picker_helper = new kColumnPickerHelper(
 			$this->Application->GetVar('main_prefix'),
 			$this->Application->GetLinkedVar('grid_name')
 		);
 
 		$picked = trim($this->Application->GetVar('picked_str'), '|');
 		$hidden = trim($this->Application->GetVar('hidden_str'), '|');
 
 		$picker_helper->saveColumns($picked, $hidden);
 		$this->finalizePopup($event);
 	}
 
 	/**
 	 * Saves various admin settings via ajax
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnSaveSetting(kEvent $event)
 	{
 		if ( $this->Application->GetVar('ajax') != 'yes' ) {
 			return;
 		}
 
 		$var_name = $this->Application->GetVar('var_name');
 		$var_value = $this->Application->GetVar('var_value');
 
 		$this->Application->StorePersistentVar($var_name, $var_value);
 
 		$event->status = kEvent::erSTOP;
 	}
 
 	/**
 	 * Just closes popup & deletes last_template & opener_stack if popup, that is closing
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnClosePopup(kEvent $event)
 	{
 		$event->SetRedirectParam('opener', 'u');
 	}
 
 	/**
 	 * Occurs right after initialization of the kernel, used mainly as hook-to event
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnStartup(kEvent $event)
 	{
 		if ( $this->Application->isAdmin ) {
 			return;
 		}
 
 		$base_url = preg_quote($this->Application->BaseURL(), '/');
 		$referrer = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '';
 
 		if ( $referrer && !preg_match('/^' . $base_url . '/', $referrer) ) {
 			$this->Application->Session->SetCookie('original_referrer', $referrer);
 			$this->Application->SetVar('original_referrer', $referrer);
 		}
 	}
 
 	/**
 	 * Occurs right before echoing the output, in Done method of application, used mainly as hook-to event
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnBeforeShutdown(kEvent $event)
 	{
 
 	}
 
 	/**
 	 * Is called after tree was build (when not from cache)
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnAfterBuildTree(kEvent $event)
 	{
 
 	}
 
 	/**
 	 * Called by AJAX to perform CSV export
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	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');
 		$csv_helper->ExportStep();
 		$event->status = kEvent::erSTOP;
 	}
 
 	/**
 	 * Returning created by AJAX CSV file
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnGetCSV(kEvent $event)
 	{
+		/** @var kCSVHelper $csv_helper */
 		$csv_helper = $this->Application->recallObject('CSVHelper');
-		/* @var $csv_helper kCSVHelper */
 
 		$csv_helper->GetCSV();
 	}
 
 	/**
 	 * Start CSV import
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	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);
 		$object->SetFieldsFromHash($field_values);
 		$event->setEventParam('form_data', $field_values);
 
 		$event->redirect = false;
 		$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');
 			$result = $csv_helper->ImportStart($object->GetField('ImportFile', 'file_paths'));
 
 			if ( $result === true ) {
 				$event->redirect = $this->Application->GetVar('next_template');
 				$event->SetRedirectParam('PrefixSpecial', $this->Application->GetVar('PrefixSpecial'));
 				$event->SetRedirectParam('grid', $this->Application->GetVar('grid'));
 			}
 		}
 
 		if ( $event->redirect === false ) {
 			$object->SetError('ImportFile', $result);
 			$event->status = kEvent::erFAIL;
 		}
 	}
 
 	/**
 	 * Performs one CSV import step
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	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;
 	}
 
 	/**
 	 * Shows unit config filename, where requested prefix is defined
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnCheckPrefixConfig(kEvent $event)
 	{
 		$prefix = $this->Application->GetVar('config_prefix');
 		$config_file = $this->Application->UnitConfigReader->getPrefixFile($prefix);
 
 		$this->Application->InitParser();
 
 		ob_start();
 		echo $this->Application->ParseBlock(Array('name' => 'incs/header', 'body_properties' => 'style="background-color: #E7E7E7; margin: 8px;"'));
 		?>
 		<script type="text/javascript">
 			set_window_title('Unit Config of "<?php echo $prefix; ?>" prefix');
 		</script>
 
 		<a href="javascript:window_close();">Close Window</a><br /><br />
 		<strong>Prefix:</strong> <?php echo $prefix; ?><br />
 		<strong>Unit Config:</strong> <?php echo $GLOBALS['debugger']->highlightString($config_file); ?><br />
 		<br /><a href="javascript:window_close();">Close Window</a><br />
 
 		<?php
 		echo $this->Application->ParseBlock(Array ('name' => 'incs/footer'));
 		echo ob_get_clean();
 
 		$event->status = kEvent::erSTOP;
 	}
 
 	/**
 	 * Deletes temp tables, when user closes window using "x" button in top right corner
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnDropTempTablesByWID(kEvent $event)
 	{
 		$sid = $this->Application->GetSID();
 		$wid = $this->Application->GetVar('m_wid');
 		$tables = $this->Conn->GetCol('SHOW TABLES');
 		$mask_edit_table = '/' . TABLE_PREFIX . 'ses_' . $sid . '_' . $wid . '_edit_(.*)$/';
 
 		foreach ($tables as $table) {
 			if ( preg_match($mask_edit_table, $table, $rets) ) {
 				$this->Conn->Query('DROP TABLE IF EXISTS ' . $table);
 			}
 		}
 
 		echo 'OK';
 		$event->status = kEvent::erSTOP;
 	}
 
 
 	/**
 	 * Backup all data
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	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;
 		}
 
 		$event->redirect = 'tools/backup2';
 	}
 
 	/**
 	 * Perform next backup step
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnBackupProgress(kEvent $event)
 	{
+		/** @var BackupHelper $backup_helper */
 		$backup_helper = $this->Application->recallObject('BackupHelper');
-		/* @var $backup_helper BackupHelper */
 
 		$done_percent = $backup_helper->performBackup();
 
 		if ( $done_percent == 100 ) {
 			$event->redirect = 'tools/backup3';
 			return;
 		}
 
 		$event->status = kEvent::erSTOP;
 		echo $done_percent;
 	}
 
 	/**
 	 * Stops Backup & redirect to Backup template
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnBackupCancel(kEvent $event)
 	{
 		$event->redirect = 'tools/backup1';
 	}
 
 	/**
 	 * Starts restore process
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	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';
 	}
 
 	/**
 	 * Performs next restore step
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnRestoreProgress(kEvent $event)
 	{
+		/** @var BackupHelper $backup_helper */
 		$backup_helper = $this->Application->recallObject('BackupHelper');
-		/* @var $backup_helper BackupHelper */
 
 		$done_percent = $backup_helper->performRestore();
 
 		if ( $done_percent == BackupHelper::SQL_ERROR_DURING_RESTORE ) {
 			$event->redirect = 'tools/restore4';
 		}
 		elseif ( $done_percent == BackupHelper::FAILED_READING_BACKUP_FILE ) {
 			$this->Application->StoreVar('adm.restore_error', 'File read error');
 			$event->redirect = 'tools/restore4';
 		}
 		elseif ( $done_percent == 100 ) {
 			$backup_helper->replaceRestoredFiles();
 			$this->Application->StoreVar('adm.restore_success', 1);
 			$event->redirect = 'tools/restore4';
 		}
 		else {
 			$event->status = kEvent::erSTOP;
 			echo $done_percent;
 		}
 	}
 
 	/**
 	 * Stops Restore & redirect to Restore template
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnRestoreCancel(kEvent $event)
 	{
 		$event->redirect = 'tools/restore1';
 	}
 
 	/**
 	 * Deletes one backup file
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnDeleteBackup(kEvent $event)
 	{
+		/** @var BackupHelper $backup_helper */
 		$backup_helper = $this->Application->recallObject('BackupHelper');
-		/* @var $backup_helper BackupHelper */
 
 		$backup_helper->delete();
 	}
 
 	/**
 	 * Starts restore process
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnSqlQuery(kEvent $event)
 	{
 		$sql = $this->Application->GetVar('sql');
 
 		if ( $sql ) {
 			$start = microtime(true);
 			$result = $this->Conn->Query($sql);
 			$this->Application->SetVar('sql_time', round(microtime(true) - $start, 7));
 
 			if ( $result && is_array($result) ) {
 				$this->Application->SetVar('sql_has_rows', 1);
 				$this->Application->SetVar('sql_rows', serialize($result));
 			}
 
 			$check_sql = trim(strtolower($sql));
 
 			if ( preg_match('/^(insert|update|replace|delete)/', $check_sql) ) {
 				$this->Application->SetVar('sql_has_affected', 1);
 				$this->Application->SetVar('sql_affected', $this->Conn->getAffectedRows());
 			}
 		}
 
 		$this->Application->SetVar('query_status', 1);
 		$event->status = kEvent::erFAIL;
 	}
 
 	/**
 	 * Occurs after unit config cache was successfully rebuilt
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnAfterCacheRebuild(kEvent $event)
 	{
 
 	}
 
 	/**
 	 * Removes "Community -> Groups" section when it is not allowed
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnAfterConfigRead(kEvent $event)
 	{
 		parent::OnAfterConfigRead($event);
 
 		$config = $event->getUnitConfig();
 
 		if ( !$this->Application->ConfigValue('AdvancedUserManagement') ) {
 			$config->addSectionAdjustments('remove', 'in-portal:user_groups');
 		}
 
 		$config->addSectionAdjustments(Array (
 			'label' => $this->Application->ConfigValue('Site_Name')
 		), 'in-portal:root');
 	}
 
 	/**
 	 * Saves menu (tree) frame width
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnSaveMenuFrameWidth(kEvent $event)
 	{
 		$event->status = kEvent::erSTOP;
 
 		if ( !$this->Application->ConfigValue('ResizableFrames') ) {
 			return;
 		}
 
 		$this->Application->StorePersistentVar('MenuFrameWidth', (int)$this->Application->GetVar('width'));
 	}
 
 	/**
 	 * Retrieves data from memory cache
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnMemoryCacheGet(kEvent $event)
 	{
 		$event->status = kEvent::erSTOP;
 
 		$ret = Array ('message' => '', 'code' => 0); // 0 - ok, > 0 - error
 		$key = $this->Application->GetVar('key');
 
 		if ( !$key ) {
 			$ret['code'] = 1;
 			$ret['message'] = 'Key name missing';
 		}
 		else {
 			$value = $this->Application->getCache($key);
 
 			$ret['value'] =& $value;
 			$ret['size'] = is_string($value) ? kUtil::formatSize(strlen($value)) : '?';
 			$ret['type'] = gettype($value);
 
 			if ( kUtil::IsSerialized($value) ) {
 				$value = unserialize($value);
 			}
 
 			if ( is_array($value) ) {
 				$ret['value'] = print_r($value, true);
 			}
 
 			if ( $ret['value'] === false ) {
 				$ret['code'] = 2;
 				$ret['message'] = 'Key "' . $key . '" doesn\'t exist';
 			}
 		}
 
+		/** @var JSONHelper $json_helper */
 		$json_helper = $this->Application->recallObject('JSONHelper');
-		/* @var $json_helper JSONHelper */
 
 		echo $json_helper->encode($ret);
 	}
 
 	/**
 	 * Retrieves data from memory cache
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnMemoryCacheSet(kEvent $event)
 	{
 		$event->status = kEvent::erSTOP;
 
 		$ret = Array ('message' => '', 'code' => 0); // 0 - ok, > 0 - error
 		$key = $this->Application->GetVar('key');
 
 		if ( !$key ) {
 			$ret['code'] = 1;
 			$ret['message'] = 'Key name missing';
 		}
 		else {
 			$value = $this->Application->GetVar('value');
 			$res = $this->Application->setCache($key, $value);
 
 			$ret['result'] = $res ? 'OK' : 'FAILED';
 		}
 
+		/** @var JSONHelper $json_helper */
 		$json_helper = $this->Application->recallObject('JSONHelper');
-		/* @var $json_helper JSONHelper */
 
 		echo $json_helper->encode($ret);
 	}
 
 	/**
 	 * Deploy changes
 	 *
 	 * Usage: "php tools/run_event.php adm:OnDeploy b674006f3edb1d9cd4d838c150b0567d"
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnDeploy(kEvent $event)
 	{
 		$this->_deploymentAction($event);
 	}
 
 	/**
 	 * Synchronizes database revisions from "project_upgrades.sql" file
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnSynchronizeDBRevisions(kEvent $event)
 	{
 		$this->_deploymentAction($event, true);
 	}
 
 	/**
 	 * Common code to invoke deployment helper
 	 *
 	 * @param kEvent $event
 	 * @param bool $dry_run
 	 * @return void
 	 * @access protected
 	 */
 	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);
 
 		if ( $deployment_helper->deployAll($dry_run) ) {
 			$event->SetRedirectParam('action_completed', 1);
 
 			if ( !$deployment_helper->isCommandLine ) {
 				// browser invocation -> don't perform redirect
 				$event->redirect = false;
 
 				// no redirect, but deployment succeeded - set redirect params directly
 				foreach ($event->getRedirectParams() as $param_name => $param_value) {
 					$this->Application->SetVar($param_name, $param_value);
 				}
 			}
 		}
 		else {
 			$event->status = kEvent::erFAIL;
 		}
 	}
 
 	/**
 	 * [SCHEDULED TASK]
 	 * 1. Delete all Debug files from system/.restricted folder	(format debug_@977827436@.txt)
 	 * 2. Run MySQL OPTIMIZE SQL one by one on all In-Portal tables (found by prefix).
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnOptimizePerformance(kEvent $event)
 	{
 		$start_time = time();
 
 		$sql = 'SELECT SessionKey
 				FROM ' . TABLE_PREFIX . 'UserSessions
 				WHERE LastAccessed > ' . $start_time;
 		$active_sessions = array_flip($this->Conn->GetCol($sql));
 
 		$files = scandir(RESTRICTED);
 		$file_path = RESTRICTED . '/';
 
 		foreach ($files AS $file_name) {
 			if ( !preg_match('#^debug_@([0-9]{9})@.txt$#', $file_name, $matches) ) {
 				// not debug file
 				continue;
 			}
 
 			$sid = $matches[1];
 
 			if ( isset($active_sessions[$sid]) || (filemtime($file_path . $file_name) > $start_time) ) {
 				// debug file belongs to an active session
 				// debug file is recently created (after sessions snapshot)
 				continue;
 			}
 
 			unlink($file_path . $file_name);
 		}
 
 		$system_tables = $this->Conn->GetCol('SHOW TABLES LIKE "' . TABLE_PREFIX . '%"');
 
 		foreach ($system_tables AS $table_name) {
 			$this->Conn->Query('OPTIMIZE TABLE ' . $table_name);
 		}
 	}
 
 	/**
 	 * [SCHEDULED TASK] Pre-resizes images, used in templates
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnPreResizeImages(kEvent $event)
 	{
 		$scheduled_task = $event->MasterEvent->getObject();
 		/* @var $scheduled_task kDBItem */
 
 		$mass_resizer = new MassImageResizer();
 
 		// rules from scheduled task itself
 		$mass_resizer->addRules($scheduled_task->GetDBField('Settings'));
 
 		// rules from all enabled themes
 		$sql = 'SELECT ImageResizeRules
 				FROM ' . $this->Application->getUnitConfig('theme')->getTableName() . '
 				WHERE Enabled = 1';
 		$mass_resizer->addRules($this->Conn->GetCol($sql));
 
 		$mass_resizer->run();
 	}
 
 	/**
 	 * Returns popup size (by template), if not cached, then parse template to get value
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnGetPopupSize(kEvent $event)
 	{
 		$event->status = kEvent::erSTOP;
 
 		if ( $this->Application->GetVar('ajax') != 'yes' ) {
 			return;
 		}
 
 		$t = $this->Application->GetVar('template_name');
 
 		$sql = 'SELECT *
 				FROM ' . TABLE_PREFIX . 'PopupSizes
 				WHERE TemplateName = ' . $this->Conn->qstr($t);
 		$popup_info = $this->Conn->GetRow($sql);
 
 		$this->Application->setContentType('text/plain');
 
 		if ( !$popup_info ) {
 			// dies when SetPopupSize tag found & in ajax request
 			$this->Application->InitParser();
 			$this->Application->ParseBlock(Array ('name' => $t));
 
 			// tag SetPopupSize not found in template -> use default size
 			echo '750x400';
 		}
 		else {
 			echo $popup_info['PopupWidth'] . 'x' . $popup_info['PopupHeight'];
 		}
 	}
 
 	/**
 	 * Writes HTTP request to System Log
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access public
 	 */
 	public function OnLogHttpRequest(kEvent $event)
 	{
 		if ( defined('DBG_REQUEST_LOG') && DBG_REQUEST_LOG && $this->Application->LoggedIn() ) {
 			$log = $this->Application->log('HTTP_REQUEST')->addRequestData();
 
 			if ( !$log->write() ) {
 				trigger_error('Unable to log Http Request due disabled "System Log"', E_USER_WARNING);
 			}
 		}
 	}
 }
 
 /**
  * Resizes multiple images according to given rules
  */
 class MassImageResizer extends kBase {
 
 	/**
 	 * Rules, that tell how images must be resized
 	 *
 	 * @var Array
 	 * @access private
 	 */
 	private $_rules = Array ();
 
 	/**
 	 * Remembers, which fields of which unit are used
 	 *
 	 * @var Array
 	 * @access private
 	 */
 	private $_unitFields = Array ();
 
 	/**
 	 * Remembers which fields of which units require which format
 	 *
 	 * @var Array
 	 * @access private
 	 */
 	private $_unitFieldFormats = Array ();
 
 	/**
 	 * Adds more resize rules
 	 *
 	 * @param string|Array $rules
 	 * @return void
 	 * @access public
 	 */
 	public function addRules($rules)
 	{
 		$rules = (array)$rules;
 
 		foreach ($rules as $rule) {
 			$rule = $this->_cleanup($rule);
 
 			if ( $rule ) {
 				$this->_rules = array_merge($this->_rules, $rule);
 			}
 		}
 	}
 
 	/**
 	 * Normalizes given set of rules
 	 *
 	 * @param string $rules
 	 * @return Array
 	 * @access private
 	 */
 	private function _cleanup($rules)
 	{
 		$ret = explode("\n", str_replace(Array ("\r\n", "\r"), "\n", $rules));
 
 		return array_filter(array_map('trim', $ret));
 	}
 
 	/**
 	 * Transforms rules given in raw format into 3D array of easily manageable rules
 	 *
 	 * @return void
 	 * @access private
 	 */
 	private function _preProcessRules()
 	{
 		foreach ($this->_rules as $raw_rule) {
 			list ($prefix, $field, $format) = explode(':', $raw_rule, 3);
 
 			if ( !isset($this->_unitFields[$prefix]) ) {
 				$this->_unitFields[$prefix] = Array ();
 				$this->_unitFieldFormats[$prefix] = Array ();
 			}
 
 			$this->_unitFields[$prefix][] = $field;
 
 			if ( !isset($this->_unitFieldFormats[$prefix][$field]) ) {
 				$this->_unitFieldFormats[$prefix][$field] = Array ();
 			}
 
 			$this->_unitFieldFormats[$prefix][$field][] = $format;
 		}
 	}
 
 	/**
 	 * Performs resize operation
 	 *
 	 * @return void
 	 * @access public
 	 */
 	public function run()
 	{
 		$this->_preProcessRules();
 
 		foreach ($this->_unitFields as $prefix => $fields) {
 			$sql = 'SELECT ' . implode(',', array_unique($fields)) . '
 					FROM ' . $this->Application->getUnitConfig($prefix)->getTableName();
 			$unit_data = $this->Conn->GetIterator($sql);
 
 			if ( !count($unit_data) ) {
 				continue;
 			}
 
 			$object = $this->Application->recallObject($prefix . '.resize', null, Array ('skip_autoload' => true));
 			/* @var $object kDBItem */
 
 			foreach ($unit_data as $field_values) {
 				foreach ($field_values as $field => $value) {
 					if ( !$value ) {
 						continue;
 					}
 
 					$object->SetDBField($field, $value);
 
 					foreach ($this->_unitFieldFormats[$prefix][$field] as $format) {
 						// will trigger image resize if needed
 						$object->GetField($field, $format);
 					}
 				}
 			}
 		}
 	}
 }
 
 
 class UnitConfigDecorator {
 
 	var $parentPath = Array ();
 
 	/**
 	 * Decorates given array
 	 *
 	 * @param Array $var
 	 * @param int $level
 	 * @return string
 	 */
 	public function decorate($var, $level = 0)
 	{
 		$ret = '';
 
 		$deep_level = count($this->parentPath);
 
 		if ( $deep_level && ($this->parentPath[0] == 'Fields') ) {
 			$expand = $level < 2;
 		}
 		elseif ( $deep_level && ($this->parentPath[0] == 'Grids') ) {
 			if ( $deep_level == 3 && $this->parentPath[2] == 'Icons' ) {
 				$expand = false;
 			}
 			else {
 				$expand = $level < 4;
 			}
 		}
 		else {
 			$expand = $level == 0;
 		}
 
 		if ( is_array($var) ) {
 			$ret .= 'array(';
 			$prepend = $expand ? "\n" . str_repeat("\t", $level + 1) : '';
 
 			foreach ($var as $key => $value) {
 				array_push($this->parentPath, $key);
 				$ret .= $prepend . (is_string($key) ? "'" . $key . "'" : $key) . ' => ' . $this->decorate($value, $level + 1);
 				$ret .= ',' . ($expand ? '' : ' ');
 				array_pop($this->parentPath);
 			}
 
 			$prepend = $expand ? "\n" . str_repeat("\t", $level) : '';
 
 			if ( !$expand ) {
 				$ret = rtrim($ret, ', ');
 			}
 
 			$ret .=  $prepend . ')';
 		}
 		else {
 			if ( is_null($var) ) {
 				$ret = 'null';
 			}
 			elseif ( is_string($var) ) {
 				$ret = "'" . $var . "'";
 			}
 			else {
 				$ret = $var;
 			}
 		}
 
 		return $ret;
 	}
 }
Index: branches/5.3.x/core/units/admin/admin_tag_processor.php
===================================================================
--- branches/5.3.x/core/units/admin/admin_tag_processor.php	(revision 16518)
+++ branches/5.3.x/core/units/admin/admin_tag_processor.php	(revision 16519)
@@ -1,1226 +1,1227 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class AdminTagProcessor extends kDBTagProcessor {
 
 		/**
 		 * Allows to execute js script after the page is fully loaded
 		 *
 		 * @param Array $params
 		 * @return string
 		 */
 		function AfterScript($params)
 		{
 			$after_script = $this->Application->GetVar('after_script');
 			if ($after_script) {
 				return '<script type="text/javascript">'.$after_script.'</script>';
 			}
 			return '';
 		}
 
 		/**
 		 * Returns section title with #section# keyword replaced with current section
 		 *
 		 * @param Array $params
 		 * @return string
 		 */
 		function GetSectionTitle($params)
 		{
 			if (array_key_exists('default', $params)) {
 				return $params['default'];
 			}
 
 			return $this->Application->Phrase( kUtil::replaceModuleSection($params['phrase']) );
 		}
 
 		/**
 		 * Returns section icon with #section# keyword replaced with current section
 		 *
 		 * @param Array $params
 		 * @return string
 		 */
 		function GetSectionIcon($params)
 		{
 			return kUtil::replaceModuleSection($params['icon']);
 		}
 
 		/**
 		 * Returns version of module by name
 		 *
 		 * @param Array $params
 		 * @return string
 		 */
 		function ModuleVersion($params)
 		{
 			return $this->Application->findModule('Name', $params['module'], 'Version');
 		}
 
 		/**
 		 * Used in table form section drawing
 		 *
 		 * @param Array $params
 		 * @return string
 		 */
 		function DrawTree($params)
 		{
 			static $deep_level = 0;
 
 			// when processings, then sort children by priority (key of children array)
 			$ret = '';
 			$section_name = $params['section_name'];
 			$params['name'] = $this->SelectParam($params, 'name,render_as,block');
+
+			/** @var kSectionsHelper $sections_helper */
 			$sections_helper = $this->Application->recallObject('SectionsHelper');
-			/* @var $sections_helper kSectionsHelper */
 
 			$section_data =& $sections_helper->getSectionData($section_name);
 
 			$params['children_count'] = isset($section_data['children']) ? count($section_data['children']) : 0;
 			$params['deep_level'] = $deep_level++;
 			$template = $section_data['url']['t'];
 			unset($section_data['url']['t']);
 
 			$section_data['section_url'] = $this->Application->HREF($template, '', $section_data['url']);
 			$ret .= $this->Application->ParseBlock( array_merge($params, $section_data) );
 			if (!isset($section_data['children'])) {
 				return $ret;
 			}
 
 			ksort($section_data['children'], SORT_NUMERIC);
 			foreach ($section_data['children'] as $section_name) {
 				if (!$sections_helper->sectionVisible($section_name)) {
 					continue;
 				}
 
 				$params['section_name'] = $section_name;
 				$ret .= $this->DrawTree($params);
 				$deep_level--;
 			}
 
 
 			return $ret;
 		}
 
 
 		function SectionInfo($params)
 		{
 			$section = $params['section'];
 			if ($section == '#session#') {
 				$section = $this->Application->RecallVar('section');
 			}
 
+			/** @var kSectionsHelper $sections_helper */
 			$sections_helper = $this->Application->recallObject('SectionsHelper');
-			/* @var $sections_helper kSectionsHelper */
 
 			$section_data =& $sections_helper->getSectionData($section);
 			if (!$section_data) {
 				throw new Exception('Use of undefined section "<strong>' . $section . '</strong>" in "<strong>' . __METHOD__ . '</strong>"');
 			}
 
 			if (array_key_exists('parent', $params) && $params['parent']) {
 				do {
 					$section = $section_data['parent'];
 					$section_data =& $sections_helper->getSectionData($section);
 				} while (array_key_exists('use_parent_header', $section_data) && $section_data['use_parent_header']);
 			}
 
 			$info = $params['info'];
 			switch ($info) {
 				case 'module_path':
 					if (isset($params['module']) && $params['module']) {
 						$module = $params['module'];
 					}
 					elseif (isset($section_data['icon_module'])) {
 						$module = $section_data['icon_module'];
 					}
 					else {
 						$module = '#session#';
 					}
 					$res = $this->ModulePath(array('module' => $module));
 					break;
 
 				case 'perm_section':
 					$res = $sections_helper->getPermSection($section);
 					break;
 
 				case 'label':
 					$res = '';
 
 					if ( $section ) {
 						if ( $section == 'in-portal:root' ) {
 							// don't translate label for top section, because it's already translated
 							$res = $section_data['label'];
 						}
 						else {
 							$no_editing = array_key_exists('no_editing', $params) ? $params['no_editing'] : false;
 
 							$res = $this->Application->Phrase($section_data['label'], !$no_editing);
 						}
 					}
 					break;
 
 				default:
 					$res = $section_data[$info];
 					break;
 			}
 
 			if (array_key_exists('as_label', $params) && $params['as_label']) {
 				$res = $this->Application->Phrase($res);
 			}
 
 			return $res;
 		}
 
 
 		function PrintSection($params)
 		{
 			$section_name = $params['section_name'];
 			if ($section_name == '#session#') {
 				$section_name = $this->Application->RecallVar('section');
 			}
 
+			/** @var kSectionsHelper $sections_helper */
 			$sections_helper = $this->Application->recallObject('SectionsHelper');
-			/* @var $sections_helper kSectionsHelper */
 
 			if (isset($params['use_first_child']) && $params['use_first_child']) {
 				$section_name = $sections_helper->getFirstChild($section_name, true);
 			}
 
 			$section_data =& $sections_helper->getSectionData($section_name);
 
 			$params['name'] = $this->SelectParam($params, 'name,render_as,block');
 			$params['section_name'] = $section_name;
 
 			$url_params = $section_data['url'];
 			unset($url_params['t']);
 
 			$section_data['section_url'] = $this->Application->HREF($section_data['url']['t'], '', $url_params);
 			$ret = $this->Application->ParseBlock( array_merge($params, $section_data) );
 
 			return $ret;
 		}
 
 		/**
 		 * Used in XML drawing for tree
 		 *
 		 * @param Array $params
 		 * @return string
 		 */
 		function PrintSections($params)
 		{
 			// when processings, then sort children by priority (key of children array)
 			$ret = '';
 			$section_name = $params['section_name'];
 			if ($section_name == '#session#') {
 				$section_name = $this->Application->RecallVar('section');
 			}
 
+			/** @var kSectionsHelper $sections_helper */
 			$sections_helper = $this->Application->recallObject('SectionsHelper');
-			/* @var $sections_helper kSectionsHelper */
 
 			$section_data =& $sections_helper->getSectionData($section_name);
 
 			$params['name'] = $this->SelectParam($params, 'name,render_as,block');
 			if (!isset($section_data['children'])) {
 				return '';
 			}
 
 			ksort($section_data['children'], SORT_NUMERIC);
 			foreach ($section_data['children'] as $section_name) {
 				$params['section_name'] = $section_name;
 				$section_data =& $sections_helper->getSectionData($section_name);
 
 				if (!$sections_helper->sectionVisible($section_name)) {
 					continue;
 				}
 				else {
 					$show_mode = isset($section_data['show_mode']) ? $section_data['show_mode'] : smNORMAL;
 					$section_data['debug_only'] = ($show_mode == smDEBUG) || ($show_mode == smSUPER_ADMIN) ? 1 : 0;
 				}
 
 				if (isset($section_data['tabs_only']) && $section_data['tabs_only']) {
 					$perm_status = false;
 					$folder_label = $section_data['label'];
 					ksort($section_data['children'], SORT_NUMERIC);
 					foreach ($section_data['children'] as $priority => $section_name) {
 						// if only tabs in this section & none of them have permission, then skip section too
 
 						$section_name = $sections_helper->getPermSection($section_name);
 						$perm_status = $this->Application->CheckPermission($section_name.'.view', 1);
 						if ($perm_status) {
 							break;
 						}
 					}
 					if (!$perm_status) {
 						// no permission for all tabs -> don't display tree node either
 						continue;
 					}
 
 					$params['section_name'] = $section_name;
 					$section_data =& $sections_helper->getSectionData($section_name);
 					$section_data['label'] = $folder_label; // use folder label in tree
 					$section_data['is_tab'] = 1;
 				}
 				else  {
 					$section_name = $sections_helper->getPermSection($section_name);
 					if (!$this->Application->CheckPermission($section_name.'.view', 1)) continue;
 				}
 
 				$params['children_count'] = isset($section_data['children']) ? count($section_data['children']) : 0;
 
 				// remove template, so it doesn't appear as additional parameter in url
 				$template = $section_data['url']['t'];
 				unset($section_data['url']['t']);
 
 				$section_data['section_url'] = $this->Application->HREF($template, '', $section_data['url']);
 
 				$late_load = getArrayValue($section_data, 'late_load');
 				if ($late_load) {
 					$t = $late_load['t'];
 					unset($late_load['t']);
 					$section_data['late_load'] = $this->Application->HREF($t, '', $late_load);
 					$params['children_count'] = 99;
 				}
 				else {
 					$section_data['late_load'] = '';
 				}
 
 				// restore template
 				$section_data['url']['t'] = $template;
 
 				$ret .= $this->Application->ParseBlock( array_merge($params, $section_data) );
 				$params['section_name'] = $section_name;
 			}
 
 			return preg_replace("/\r\n|\n/", '', $ret);
 		}
 
 		function ListSectionPermissions($params)
 		{
 			$section_name = isset($params['section_name']) ? $params['section_name'] : $this->Application->GetVar('section_name');
 
+			/** @var kSectionsHelper $sections_helper */
 			$sections_helper = $this->Application->recallObject('SectionsHelper');
-			/* @var $sections_helper kSectionsHelper */
 
 			$section_data =& $sections_helper->getSectionData($section_name);
 
 			$block_params = array_merge($section_data, Array('name' => $params['render_as'], 'section_name' => $section_name));
 
 			$ret = '';
 			foreach ($section_data['permissions'] as $perm_name) {
 				if (preg_match('/^advanced:(.*)/', $perm_name) != $params['type']) continue;
 				$block_params['perm_name'] = $perm_name;
 				$ret .= $this->Application->ParseBlock($block_params);
 			}
 			return $ret;
 		}
 
 		function ModuleInclude($params)
 		{
 			foreach ($params as $param_name => $param_value) {
 				$params[$param_name] = kUtil::replaceModuleSection($param_value);
 			}
 
 			return $this->Application->ProcessParsedTag('m', 'ModuleInclude', $params);
 		}
 
 		function TodayDate($params)
 		{
 			return date($params['format']);
 		}
 
 		/**
 		 * Draws section tabs using block name passed
 		 *
 		 * @param Array $params
 		 */
 		function ListTabs($params)
 		{
+			/** @var kSectionsHelper $sections_helper */
 			$sections_helper = $this->Application->recallObject('SectionsHelper');
-			/* @var $sections_helper kSectionsHelper */
 
 			$section_data =& $sections_helper->getSectionData($params['section_name']);
 
 			$ret = '';
 			$block_params = Array('name' => $params['render_as']);
 			ksort($section_data['children'], SORT_NUMERIC);
 			foreach ($section_data['children'] as $priority => $section_name) {
 				$perm_section = $sections_helper->getPermSection($section_name);
 
 				if ( !$this->Application->CheckPermission($perm_section.'.view') ) {
 					continue;
 				}
 
 				$tab_data =& $sections_helper->getSectionData($section_name);
 				$block_params['t'] = $tab_data['url']['t'];
 				$block_params['pass'] = $tab_data['url']['pass'];
 				$block_params['title'] = $tab_data['label'];
 				$block_params['main_prefix'] = $section_data['SectionPrefix'];
 				$ret .= $this->Application->ParseBlock($block_params);
 			}
 
 
 			return $ret;
 		}
 
 		/**
 		 * Returns list of module item tabs that have view permission in current category
 		 *
 		 * @param Array $params
 		 */
 		function ListCatalogTabs($params)
 		{
 			$ret = '';
 			$special = isset($params['special']) ? $params['special'] : '';
 			$replace_main = isset($params['replace_m']) && $params['replace_m'];
 			$skip_prefixes = isset($params['skip_prefixes']) ? explode(',', $params['skip_prefixes']) : Array ();
 
 			$block_params = $this->prepareTagParams($params);
 			$block_params['name'] = $params['render_as'];
 
 			foreach ($this->Application->ModuleInfo as $module_name => $module_info) {
 				$prefix = $module_info['Var'];
 
 				if ( $prefix == 'm' && $replace_main ) {
 					$prefix = 'c';
 				}
 
 				if ( $this->Application->prefixRegistred($prefix) ) {
 					$config = $this->Application->getUnitConfig($prefix);
 				}
 				else {
 					$config = null;
 				}
 
 				if ( in_array($prefix, $skip_prefixes) || !is_object($config) || !$config->getCatalogItem() ) {
 					continue;
 				}
 
 				$icon = $config->getCatalogTabIcon();
 
 				if ( strpos($icon, ':') !== false ) {
 					list ($icon_module, $icon) = explode(':', $icon, 2);
 				}
 				else {
 					$icon_module = 'core';
 				}
 
 				$label = $config->getSetting($params['title_property']);
 				$block_params['title'] = $label;
 				$block_params['prefix'] = $prefix;
 				$block_params['icon_module'] = $icon_module;
 				$block_params['icon'] = $icon;
 
 				$ret .= $this->Application->ParseBlock($block_params);
 			}
 
 			return $ret;
 		}
 
 		/**
 		 * Renders inividual catalog tab based on prefix and title_property given
 		 *
 		 * @param Array $params
 		 * @return string
 		 */
 		function CatalogTab($params)
 		{
 			$config = $this->Application->getUnitConfig($params['prefix']);
 			$icon = $config->getCatalogTabIcon();
 
 			if ( strpos($icon, ':') !== false ) {
 				list ($icon_module, $icon) = explode(':', $icon, 2);
 			}
 			else {
 				$icon_module = 'core';
 			}
 
 			$block_params = $this->prepareTagParams($params);
 			$block_params['name'] = $params['render_as'];
 			$block_params['icon_module'] = $icon_module;
 			$block_params['icon'] = $icon;
 			$block_params['title'] = $config->getSetting($params['title_property']);
 
 			return $this->Application->ParseBlock($block_params);
 		}
 
 		/**
 		 * Allows to construct link for opening any type of catalog item selector.
 		 *
 		 * @param array $params Tag params.
 		 *
 		 * @return string
 		 */
 		function SelectorLink($params)
 		{
 			$template = $this->SelectParam($params, 't,template');
 
 			if ( !$template ) {
 				$mode = 'catalog';
 
 				// {catalog, advanced_view}
 				if ( isset($params['mode']) ) {
 					$mode = $params['mode'];
 					unset($params['mode']);
 				}
 
 				$params['t'] = 'catalog/item_selector/item_selector_' . $mode;
 			}
 
 			if ( !isset($params['m_cat_id']) ) {
 				$params['m_cat_id'] = $this->Application->getBaseCategory();
 			}
 
 			$default_params = array('pass' => 'all');
 
 			if ( isset($params['prefix']) && $params['prefix'] ) {
 				$default_params['pass'] .= ',' . $params['prefix'];
 				unset($params['prefix']);
 			}
 
 			$pass_through = $this->Application->GetVar('pass_through', '');
 
 			if ( isset($params['pass_through']) && $params['pass_through'] ) {
 				$pass_through .= ',' . $params['pass_through'];
 			}
 
 			$pass_through = array_filter(explode(',', $pass_through));
 
 			// {yes, no}
 			if ( isset($params['tabs_dependant']) ) {
 				$params['td'] = $params['tabs_dependant'];
 				$pass_through[] = 'td';
 				unset($params['tabs_dependant']);
 			}
 
 			// {single, multi}
 			if ( isset($params['selection_mode']) ) {
 				$params['tm'] = $params['selection_mode'];
 				$pass_through[] = 'tm';
 				unset($params['selection_mode']);
 			}
 
 			// {all, none, <comma separated prefix list>}
 			if ( isset($params['tab_prefixes']) ) {
 				$params['tp'] = $params['tab_prefixes'];
 				$pass_through[] = 'tp';
 				unset($params['tab_prefixes']);
 			}
 
 			if ( $pass_through ) {
 				// Add pass_through to selector url if any.
 				$params['pass_through'] = implode(',', array_unique($pass_through));
 			}
 
 			// user can override default parameters (except pass_through of course)
 			$params = array_merge($default_params, $params);
 
 			return $this->Application->ProcessParsedTag('m', 'T', $params);
 		}
 
 		function TimeFrame($params)
 		{
 			$w = date('w');
 			$m = date('m');
 			$y = date('Y');
 
 			//FirstDayOfWeek is 0 for Sunday and 1 for Monday
 			$fdow = $this->Application->ConfigValue('FirstDayOfWeek');
 
 			if ( $fdow && $w == 0 ) {
 				$w = 7;
 			}
 
 			$today_start = mktime(0, 0, 0, date('m'), date('d'), $y);
 			$first_day_of_this_week = $today_start - ($w - $fdow) * 86400;
 			$first_day_of_this_month = mktime(0, 0, 0, $m, 1, $y);
 			$this_quater = ceil($m / 3);
 			$this_quater_start = mktime(0, 0, 0, $this_quater * 3 - 2, 1, $y);
 
 			switch ( $params['type'] ) {
 				case 'last_week_start':
 					$timestamp = $first_day_of_this_week - 86400 * 7;
 					break;
 
 				case 'last_week_end':
 					$timestamp = $first_day_of_this_week - 1;
 					break;
 
 				case 'last_month_start':
 					$timestamp = $m == 1 ? mktime(0, 0, 0, 12, 1, $y - 1) : mktime(0, 0, 0, $m - 1, 1, $y);
 					break;
 
 				case 'last_month_end':
 					$timestamp = $first_day_of_this_month = mktime(0, 0, 0, $m, 1, $y) - 1;
 					break;
 
 				case 'last_quater_start':
 					$timestamp = $this_quater == 1 ? mktime(0, 0, 0, 10, 1, $y - 1) : mktime(0, 0, 0, ($this_quater - 1) * 3 - 2, 1, $y);
 					break;
 
 				case 'last_quater_end':
 					$timestamp = $this_quater_start - 1;
 					break;
 
 				case 'last_6_months_start':
 					$timestamp = $m <= 6 ? mktime(0, 0, 0, $m + 6, 1, $y - 1) : mktime(0, 0, 0, $m - 6, 1, $y);
 					break;
 
 				case 'last_year_start':
 					$timestamp = mktime(0, 0, 0, 1, 1, $y - 1);
 					break;
 
 				case 'last_year_end':
 					$timestamp = mktime(23, 59, 59, 12, 31, $y - 1);
 					break;
 
 				default:
 					$timestamp = 0;
 					break;
 			}
 
 			if ( isset($params['format']) ) {
 				$format = $params['format'];
 
 				if ( preg_match("/_regional_(.*)/", $format, $regs) ) {
+					/** @var LanguagesItem $lang */
 					$lang = $this->Application->recallObject('lang.current');
-					/* @var $lang LanguagesItem */
 
 					$format = $lang->GetDBField($regs[1]);
 				}
 
 				return date($format, $timestamp);
 			}
 
 			return $timestamp;
 		}
 
 		/**
 		 * Redirect to cache rebuild template, when required by installator
 		 *
 		 * @param Array $params
 		 */
 		function CheckPermCache($params)
 		{
 			// we have separate session between install wizard and admin console, so store in cache
 			$global_mark = $this->Application->getDBCache('ForcePermCacheUpdate');
 			$local_mark = $this->Application->RecallVar('PermCache_UpdateRequired');
 
 			if ( $global_mark || $local_mark ) {
 				$this->Application->RemoveVar('PermCache_UpdateRequired');
 				$rebuild_mode = $this->Application->ConfigValue('CategoryPermissionRebuildMode');
 
 				if ( $rebuild_mode == CategoryPermissionRebuild::SILENT ) {
+					/** @var kPermCacheUpdater $updater */
 					$updater = $this->Application->makeClass('kPermCacheUpdater');
-					/* @var $updater kPermCacheUpdater */
 
 					$updater->OneStepRun();
 
 					$this->Application->HandleEvent(new kEvent('c:OnResetCMSMenuCache'));
 				}
 				elseif ( $rebuild_mode == CategoryPermissionRebuild::AUTOMATIC ) {
 					// update with progress bar
 					return true;
 				}
 			}
 
 			return false;
 		}
 
 		/**
 		 * Checks if current protocol is SSL
 		 *
 		 * @param Array $params
 		 * @return int
 		 */
 		function IsSSL($params)
 		{
 			return (PROTOCOL == 'https://')? 1 : 0;
 		}
 
 		function PrintColumns($params)
 		{
 			$picker_helper = new kColumnPickerHelper(
 				$this->Application->RecallVar('main_prefix'),
 				$this->Application->GetLinkedVar('grid_name')
 			);
 
 			$cols = $picker_helper->getData();
 
 			$this->Application->Phrases->AddCachedPhrase('__FREEZER__', '-------------');
 
 			$o = '';
 			if ( isset($params['hidden']) && $params['hidden'] ) {
 				foreach ( $cols->hiddenFields as $column_name ) {
 					$title = $this->Application->Phrase($cols->getTitle($column_name));
 					$o .= "<option value='$column_name'>" . $title;
 				}
 			}
 			else {
 				foreach ( $cols->allFields as $column_name ) {
 					if ( $cols->isHidden($column_name) ) {
 						continue;
 					}
 
 					$title = $this->Application->Phrase($cols->getTitle($column_name));
 					$o .= "<option value='$column_name'>" . $title;
 				}
 			}
 
 			return $o;
 		}
 
 		/**
 		 * Allows to set popup size (key - current template name)
 		 *
 		 * @param Array $params
 		 * @return string
 		 * @access protected
 		 */
 		protected function SetPopupSize($params)
 		{
 			$width = $params['width'];
 			$height = $params['height'];
 
 			if ( $this->Application->GetVar('ajax') == 'yes' ) {
 				// during AJAX request just output size
 				die($width . 'x' . $height);
 			}
 
 			if ( !$this->UsePopups($params) ) {
 				return;
 			}
 
 			$t = $this->Application->GetVar('t');
 
 			$sql = 'SELECT *
 					FROM ' . TABLE_PREFIX . 'PopupSizes
 					WHERE TemplateName = ' . $this->Conn->qstr($t);
 			$popup_info = $this->Conn->GetRow($sql);
 
 			if ( !$popup_info ) {
 				// create new popup size record
 				$fields_hash = Array (
 					'TemplateName' => $t,
 					'PopupWidth' => $width,
 					'PopupHeight' => $height,
 				);
 
 				$this->Conn->doInsert($fields_hash, TABLE_PREFIX . 'PopupSizes');
 			}
 			elseif ( $popup_info['PopupWidth'] != $width || $popup_info['PopupHeight'] != $height ) {
 				// popup found and size in tag differs from one in db -> update in db
 				$fields_hash = Array (
 					'PopupWidth' => $width,
 					'PopupHeight' => $height,
 				);
 
 				$this->Conn->doUpdate($fields_hash, TABLE_PREFIX . 'PopupSizes', 'PopupId = ' . $popup_info['PopupId']);
 			}
 		}
 
 		/**
 		 * Allows to check if popups are generally enabled OR to check for "popup" or "modal" mode is enabled
 		 *
 		 * @param Array $params
 		 * @return bool
 		 */
 		function UsePopups($params)
 		{
 			if ($this->Application->GetVar('_force_popup')) {
 				return true;
 			}
 
 			$use_popups = (int)$this->Application->ConfigValue('UsePopups');
 
 			if (array_key_exists('mode', $params)) {
 				$mode_mapping = Array ('popup' => 1, 'modal' => 2);
 				return $use_popups == $mode_mapping[ $params['mode'] ];
 			}
 
 			return $use_popups;
 		}
 
 		function UseToolbarLabels($params)
 		{
 			return (int)$this->Application->ConfigValue('UseToolbarLabels');
 		}
 
 		/**
 		 * Checks if debug mode enabled (optionally) and specified constant is on
 		 *
 		 * @param Array $params
 		 * @return bool
 		 * @todo Could be a duplicate of kMainTagProcessor::ConstOn
 		 */
 		function ConstOn($params)
 		{
 			$constant_name = $this->SelectParam($params, 'name,const');
 			$debug_mode = isset($params['debug_mode']) && $params['debug_mode'] ? $this->Application->isDebugMode() : true;
 
 			return $debug_mode && kUtil::constOn($constant_name);
 		}
 
 		/**
 		 * Builds link to last template in main frame of admin
 		 *
 		 * @param Array $params
 		 * @return string
 		 */
 		function MainFrameLink($params)
 		{
 			$persistent = isset($params['persistent']) && $params['persistent'];
 			if ($persistent && $this->Application->ConfigValue('RememberLastAdminTemplate')) {
 				// check last_template in persistent session
 				$last_template = $this->Application->RecallPersistentVar('last_template_popup');
 			}
 			else {
 				// check last_template in session
 				$last_template = $this->Application->RecallVar('last_template_popup'); // because of m_opener=s there
 			}
 
 			if (!$last_template) {
 				$params['persistent'] = 1;
 				return $persistent ? false : $this->MainFrameLink($params);
 			}
 
 			list($index_file, $env) = explode('|', $last_template);
 			$vars = $this->Application->processQueryString($env, 'pass');
 			$recursion_templates = Array ('login', 'index', 'no_permission');
 
 			if (isset($vars['admin']) && $vars['admin'] == 1) {
 				// index template doesn't begin recursion on front-end (in admin frame)
 				$vars['m_theme'] = '';
 
 				if (isset($params['m_opener']) && $params['m_opener'] == 'r') {
 					// front-end link for highlighting purposes
 					$vars['t'] = 'index';
 					$vars['m_cat_id'] = $this->Application->getBaseCategory();
 				}
 
 				unset($recursion_templates[ array_search('index', $recursion_templates)]);
 			}
 
 			if (in_array($vars['t'], $recursion_templates)) {
 				// prevents redirect recursion OR old in-portal pages
 				$params['persistent'] = 1;
 				return $persistent ? false : $this->MainFrameLink($params);
 			}
 
 			$vars = array_merge($vars, $params);
 			$t = $vars['t'];
 			unset($vars['t'], $vars['persistent']);
 
 			// substitute language in link to current (link will work, even when language will be changed)
 			$vars['m_lang'] = $this->Application->GetVar('m_lang');
 
 			return $this->Application->HREF($t, '', $vars, $index_file);
 		}
 
 		/**
 		 * Returns menu frame width or 200 in case, when invalid width specified in config
 		 *
 		 * @param Array $params
 		 * @return string
 		 */
 		function MenuFrameWidth($params)
 		{
 			$width = (int)$this->Application->RecallPersistentVar('MenuFrameWidth');
 
 			if ( $width <= 0 ) {
 				$width = (int)$this->Application->ConfigValue('MenuFrameWidth');
 			}
 
 			return $width > 0 ? $width : 200;
 		}
 
 		function AdminSkin($params)
 		{
+			/** @var SkinHelper $skin_helper */
 			$skin_helper = $this->Application->recallObject('SkinHelper');
-			/* @var $skin_helper SkinHelper */
 
 			return $skin_helper->AdminSkinTag($params);
 		}
 
 		/**
 		 * Prints errors, discovered during mass template compilation
 		 *
 		 * @param $params
 		 * @return string
 		 * @access protected
 		 */
 		protected function PrintCompileErrors($params)
 		{
 			$block_params = $this->prepareTagParams($params);
 			$block_params['name'] = $params['render_as'];
 
 			$errors = $this->Application->RecallVar('compile_errors');
 			if ( !$errors ) {
 				return '';
 			}
 
 			$ret = '';
 			$errors = unserialize($errors);
 			$path_regexp = '/^' . preg_quote(FULL_PATH, '/') . '/';
 
 			foreach ($errors as $an_error) {
 				$block_params = array_merge($block_params, $an_error);
 				$block_params['file'] = preg_replace($path_regexp, '', $an_error['file'], 1);
 
 				$ret .= $this->Application->ParseBlock($block_params);
 			}
 
 			$this->Application->RemoveVar('compile_errors');
 
 			return $ret;
 		}
 
 		function CompileErrorCount($params)
 		{
 			$errors = $this->Application->RecallVar('compile_errors');
 			if (!$errors) {
 				return 0;
 			}
 
 			return count( unserialize($errors) );
 		}
 
 		/**
 		 * Detects if given exception isn't one caused by tag error
 		 *
 		 * @param Array $params
 		 * @return string
 		 * @access protected
 		 */
 		protected function IsParserException($params)
 		{
 			return mb_strtolower($params['class']) == 'parserexception';
 		}
 
 		function ExportData($params)
 		{
+			/** @var kCSVHelper $export_helper */
 			$export_helper = $this->Application->recallObject('CSVHelper');
-			/* @var $export_helper kCSVHelper */
 			$result = $export_helper->ExportData( $this->SelectParam($params, 'var,name,field') );
 			return ($result === false) ? '' : $result;
 		}
 
 		function ImportData($params)
 		{
+			/** @var kCSVHelper $import_helper */
 			$import_helper = $this->Application->recallObject('CSVHelper');
-			/* @var $import_helper kCSVHelper */
 			$result = $import_helper->ImportData( $this->SelectParam($params, 'var,name,field') );
 			return ($result === false) ? '' : $result;
 		}
 
 		function PrintCSVNotImportedLines($params)
 		{
+			/** @var kCSVHelper $import_helper */
 			$import_helper = $this->Application->recallObject('CSVHelper');
-			/* @var $import_helper kCSVHelper */
 			return  $import_helper->GetNotImportedLines();
 		}
 
 		/**
 		 * Returns input field name to
 		 * be placed on form (for correct
 		 * event processing)
 		 *
 		 * @param Array $params
 		 * @return string
 		 * @access public
 		 */
 		function InputName($params)
 		{
 			list($id, $field) = $this->prepareInputName($params);
 
 			$ret = $this->getPrefixSpecial().'[0]['.$field.']'; // 0 always, as has no idfield
 			if( getArrayValue($params, 'as_preg') ) $ret = preg_quote($ret, '/');
 			return $ret;
 		}
 
 		/**
 		 * Returns list of all backup file dates formatted
 		 * in passed block
 		 *
 		 * @param Array $params
 		 * @return string
 		 * @access public
 		 */
 		function PrintBackupDates($params)
 		{
+			/** @var BackupHelper $backup_helper */
 	 		$backup_helper = $this->Application->recallObject('BackupHelper');
-			/* @var $backup_helper BackupHelper */
 
 			$ret = '';
 			$dates = $backup_helper->getBackupFiles();
 
 			foreach ($dates as $date) {
 				$params['backuptimestamp'] = $date['filedate'];
 				$params['backuptime'] = date('F j, Y, g:i a', $date['filedate']);
 				$params['backupsize'] = round($date['filesize'] / 1024 / 1024, 2); // MBytes
 
 				$ret .= $this->Application->ParseBlock($params);
 			}
 
 	        return $ret;
 		}
 
 		/**
 		 * Returns phpinfo() output
 		 *
 		 * @param Array $params
 		 * @return string
 		 */
 		function PrintPHPinfo($params)
 		{
 			ob_start();
 			phpinfo();
 
 			return ob_get_clean();
 		}
 
 		function PrintSqlCols($params)
 		{
 			$ret = '';
 			$block = $params['render_as'];
 			$a_data = unserialize($this->Application->GetVar('sql_rows'));
 
 			$a_row = current($a_data);
 
 			foreach ($a_row AS $col => $value) {
 				$ret .= $this->Application->ParseBlock(Array ('name' => $block, 'value' => $col));
 			}
 
 			return $ret;
 		}
 
 		function PrintSqlRows($params)
 		{
 			$ret = '';
 			$block = $params['render_as'];
 			$a_data = unserialize($this->Application->GetVar('sql_rows'));
 
 			foreach ($a_data as $a_row) {
 				$cells = '';
 
 				foreach ($a_row as $value) {
 					$cells .= '<td>' . kUtil::escape($value, kUtil::ESCAPE_HTML) . '</td>';
 				}
 
 				$ret .= $this->Application->ParseBlock(Array ('name' => $block, 'cells' => $cells));
 			}
 
 			return $ret;
 		}
 
 		/**
 		 * Prints available and enabled import sources using given block
 		 *
 		 * @param Array $params
 		 * @return string
 		 */
 		function PrintImportSources($params)
  		{
  			$sql = 'SELECT *
  					FROM ' . TABLE_PREFIX . 'ImportScripts
  					WHERE (Status = ' . STATUS_ACTIVE . ') AND (Type = "CSV")';
  			$import_sources = $this->Conn->Query($sql);
 
  			$block_params = $this->prepareTagParams($params);
  			$block_params['name'] = $params['render_as'];
 
  			$ret = '';
  			foreach ($import_sources as $import_source) {
  				$block_params['script_id'] = $import_source['ImportId'];
  				$block_params['script_module'] = mb_strtolower($import_source['Module']);
  				$block_params['script_name'] = $import_source['Name'];
  				$block_params['script_prefix'] = $import_source['Prefix'];
  				$block_params['module_path'] = $this->Application->findModule('Name', $import_source['Module'], 'Path');
 
  				$ret .= $this->Application->ParseBlock($block_params);
  			}
 
  			return $ret;
  		}
 
  		/**
  		 * Checks, that new window should be opened in "incs/close_popup" template instead of refreshing parent window
  		 *
  		 * @param Array $params
  		 * @return bool
  		 */
  		function OpenNewWindow($params)
  		{
 			if (!$this->UsePopups($params)) {
 				return false;
 			}
 
  			$diff = array_key_exists('diff', $params) ? $params['diff'] : 0;
  			$wid = $this->Application->GetVar('m_wid');
 
 			$stack_name = rtrim('opener_stack_' . $wid, '_');
 			$opener_stack = $this->Application->RecallVar($stack_name);
 			$opener_stack = $opener_stack ? unserialize($opener_stack) : Array ();
 
 			return count($opener_stack) >= 2 - $diff;
  		}
 
 		/**
 		 * Allows to dynamically change current language in template
 		 *
 		 * @param Array $params
 		 */
 		function SetLanguage($params)
 		{
 			$this->Application->SetVar('m_lang', $params['language_id']);
 			$this->Application->Phrases->Init('phrases', '', $params['language_id']);
 		}
 
 		/**
 		 * Performs HTTP Authentification for administrative console
 		 *
 		 * @param Array $params
 		 * @return bool
 		 */
 		function HTTPAuth($params)
 		{
 			if ( !$this->Application->ConfigValue('UseHTTPAuth') ) {
 				// http authentification not required
 				return true;
 			}
 
 			$super_admin_ips = defined('SA_IP') ? SA_IP : false;
 			$auth_bypass_ips = $this->Application->ConfigValue('HTTPAuthBypassIPs');
 
 			if ( ($auth_bypass_ips && kUtil::ipMatch($auth_bypass_ips)) || ($super_admin_ips && kUtil::ipMatch($super_admin_ips)) ) {
 				// user ip is in ip bypass list
 				return true;
 			}
 
 			if ( !array_key_exists('PHP_AUTH_USER', $_SERVER) ) {
 				// ask user to authentificate, when not authentificated before
 				return $this->_httpAuthentificate();
 			}
 			else {
 				// validate user credentials (browsers remembers user/password
 				// and sends them each time page is visited, so no need to save
 				// authentification result in session)
 				if ( $this->Application->ConfigValue('HTTPAuthUsername') != $_SERVER['PHP_AUTH_USER'] ) {
 					// incorrect username
 					return $this->_httpAuthentificate();
 				}
 
+				/** @var kPasswordFormatter $password_formatter */
 				$password_formatter = $this->Application->recallObject('kPasswordFormatter');
-				/* @var $password_formatter kPasswordFormatter */
 
 				if ( !$password_formatter->checkPasswordFromSetting('HTTPAuthPassword', $_SERVER['PHP_AUTH_PW']) ) {
 					// incorrect password
 					return $this->_httpAuthentificate();
 				}
 			}
 
 			return true;
 		}
 
 		/**
 		 * Ask user to authentificate
 		 *
 		 * @return bool
 		 */
 		function _httpAuthentificate()
 		{
 			$realm = strip_tags( $this->Application->ConfigValue('Site_Name') );
 			header('WWW-Authenticate: Basic realm="' . $realm . '"');
 			header('HTTP/1.0 401 Unauthorized');
 
 			return false;
 		}
 
 		/**
 		 * Checks, that we are using memory cache
 		 *
 		 * @param Array $params
 		 * @return bool
 		 */
 		function MemoryCacheEnabled($params)
 		{
 			return $this->Application->isCachingType(CACHING_TYPE_MEMORY);
 		}
 
 		/**
 		 * Generates HTML for additional js and css files inclusion in accordance to selected editor language
 		 *
 		 * @param Array $params
 		 * @return string
 		 * @access protected
 		 */
 		protected function IncludeCodeMirrorFilesByLanguage($params)
 		{
 			$ret = '';
 			$language = $params['language'];
 
 			$language_map = Array (
 				'application/x-httpd-php' => array('htmlmixed.js', 'xml.js', 'javascript.js', 'css.js', 'clike.js', 'php.js'),
 				'text/css' => array('css.js'),
 				'text/html' => array('xml.js', 'javascript.js', 'css.js', 'htmlmixed.js'),
 				'text/x-sql' => array('sql.js'),
 				'text/x-mysql' => array('sql.js'),
 			);
 
 			if ( !isset($language_map[$language]) ) {
 				$language_map[$language] = Array ($language . '.js');
 			}
 
 			foreach ($language_map[$language] as $filename) {
 				$ret .= $this->_includeCodeMirrorFile($filename, $params);
 			}
 
 			return $ret;
 		}
 
 		/**
 		 * Generates code for one CodeMirror additional file inclusion
 		 *
 		 * @param string $filename
 		 * @param Array $params
 		 * @return string
 		 * @access protected
 		 * @throws InvalidArgumentException
 		 */
 		protected function _includeCodeMirrorFile($filename, $params)
 		{
 			static $included = Array ();
 
 			$name = pathinfo($filename, PATHINFO_FILENAME);
 			$extension = pathinfo($filename, PATHINFO_EXTENSION);
 
 			if ( $extension != 'js' && $extension != 'css' ) {
 				throw new InvalidArgumentException('Extension "' . $extension . '" not supported');
 			}
 
 			if ( isset($included[$filename]) ) {
 				return '';
 			}
 
 			$included[$filename] = 1;
 
 			$block_params = $this->prepareTagParams($params);
 			$block_params['name'] = $params['render_as'];
 			$block_params['resource_extension'] = $extension;
 			$block_params['resource_file'] = $name . '/' . $filename;
 
 			return $this->Application->ParseBlock($block_params);
 		}
 	}
Index: branches/5.3.x/core/units/config_search/config_search_event_handler.php
===================================================================
--- branches/5.3.x/core/units/config_search/config_search_event_handler.php	(revision 16518)
+++ branches/5.3.x/core/units/config_search/config_search_event_handler.php	(revision 16519)
@@ -1,157 +1,157 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class ConfigSearchEventHandler extends kDBEventHandler  {
 
 		/**
 		 * Changes permission section to one from REQUEST, not from config
 		 *
 		 * @param kEvent $event
 		 * @return bool
 		 * @access public
 		 */
 		public function CheckPermission(kEvent $event)
 		{
 			$module = $this->Application->GetVar('module');
 			$main_prefix = $this->Application->findModule('Name', $module, 'Var');
 
 			$section = $this->Application->getUnitConfig($main_prefix)->getPermSectionByName('search');
 			$event->setEventParam('PermSection', $section);
 
 			return parent::CheckPermission($event);
 		}
 
 		/**
 		 * Apply any custom changes to list's sql query
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
 		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			// show only items that belong to selected module
 			$module = $this->Application->GetVar('module');
 			$object->addFilter('module_filter', '%1$s.ModuleName = ' . $this->Conn->qstr($module));
 
 			// don't show disabled search items
 			$object->addFilter('active_filter', '%1$s.SimpleSearch <> -1');
 		}
 
 		/**
 		 * Updates kDBItem
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnUpdate(kEvent $event)
 		{
 			if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
 				$event->status = kEvent::erFAIL;
 				return ;
 			}
 
 			parent::OnUpdate($event);
 
 			$conf_update = new kEvent('conf:OnUpdate');
 			$conf_update->redirect = false;
 			$this->Application->HandleEvent($conf_update);
 
 			$event->SetRedirectParam('opener', 's');
 
 			// keeps module and section in REQUEST to ensure, that last admin template will work
 			$event->SetRedirectParam('module', $this->Application->GetVar('module'));
 			$event->SetRedirectParam('module_key', $this->Application->GetVar('module_key'));
 			$event->SetRedirectParam('section', $this->Application->GetVar('section'));
 		}
 
 		/**
 		 * Cancels kDBItem Editing/Creation
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnCancel(kEvent $event)
 		{
 			parent::OnCancel($event);
 
 			$event->SetRedirectParam('opener', 's');
 		}
 
 		/**
 		 * [HOOK] Creates search config record corresponding to custom field, that was just created
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnCreateCustomField($event)
 		{
+			/** @var kDBItem $custom_field */
 			$custom_field = $event->MasterEvent->getObject();
-			/* @var $custom_field kDBItem */
 
 			if ( $custom_field->GetDBField('Type') == 6 || $custom_field->GetDBField('IsSystem') == 1 ) {
 				// user & system custom fields are not searchable
 				return ;
 			}
 
+			/** @var kDBItem $object */
 			$object = $event->getObject(Array ('skip_autoload' => true));
-			/* @var $object kDBItem */
 
 			$custom_id = $custom_field->GetID();
 			if ( !$object->isLoaded() || ($object->GetDBField('CustomFieldId') != $custom_id) ) {
 				$object->Load($custom_id, 'CustomFieldId');
 			}
 
 			$cf_search = Array ();
 			$element_type = $custom_field->GetDBField('ElementType');
 
 			$cf_search['DisplayOrder'] = $custom_field->GetDBField('DisplayOrder');
 			$cf_search['FieldType'] = $element_type;
 			$cf_search['DisplayName'] = $custom_field->GetDBField('FieldLabel');
 			$cf_search['FieldName'] = $custom_field->GetDBField('FieldName');
 			$cf_search['Description'] = $custom_field->GetDBField('Prompt');
 			$cf_search['ConfigHeader'] = $custom_field->GetDBField('Heading'); //  'la_Text_CustomFields';
 			$cf_search['SimpleSearch'] = in_array($element_type, Array ('text', 'range', 'select', 'multiselect')) ? 1 : 0;
 			$cf_search['TableName'] = 'CustomFields';
 
 			$sql = 'SELECT Module
 					FROM ' . TABLE_PREFIX . 'ItemTypes
 					WHERE ItemType = ' . $custom_field->GetDBField('Type');
 
 			$cf_search['ModuleName'] = $this->Conn->GetOne($sql);
 
 			// TODO: maybe this should be SetDBFieldsFromHash instead, because all data comes from inside.
 			$object->SetFieldsFromHash($cf_search);
 			$event->setEventParam('form_data', $cf_search);
 			$object->SetDBField('CustomFieldId', $custom_id);
 
 			if ( $object->isLoaded() ) {
 				$object->Update();
 			}
 			else {
 				$object->Create();
 			}
 		}
 	}
Index: branches/5.3.x/core/units/email_queue/email_queue_eh.php
===================================================================
--- branches/5.3.x/core/units/email_queue/email_queue_eh.php	(revision 16518)
+++ branches/5.3.x/core/units/email_queue/email_queue_eh.php	(revision 16519)
@@ -1,99 +1,98 @@
 <?php
 /**
  * @version    $Id$
  * @package    In-Portal
  * @copyright    Copyright (C) 1997 - 2013 Intechnic. All rights reserved.
  * @license      GNU/GPL
  * In-Portal is Open Source software.
  * This means that this software may have been modified pursuant
  * the GNU General Public License, and as distributed it includes
  * or is derivative of works licensed under the GNU General Public License
  * or other free or open source software licenses.
  * See http://www.in-portal.org/license for copyright notices and details.
  */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class EmailQueueEventHandler extends kDBEventHandler {
 
 	/**
 	 * Allows to override standard permission mapping
 	 *
 	 * @return void
 	 * @access protected
 	 * @see kEventHandler::$permMapping
 	 */
 	protected function mapPermissions()
 	{
 		parent::mapPermissions();
 
 		$permissions = Array (
 			'OnProcessAjax' => Array ('self' => 'view'),
 			'OnProcess' => Array ('self' => true),
 		);
 
 		$this->permMapping = array_merge($this->permMapping, $permissions);
 	}
 
 	/**
 	 * Process emails from queue
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnProcessAjax(kEvent $event)
 	{
+		/** @var MailingListHelper $mailing_list_helper */
 		$mailing_list_helper = $this->Application->recallObject('MailingListHelper');
-		/* @var $mailing_list_helper MailingListHelper */
 
 		$emails_sent = 0;
 		$email_queue_progress = $this->Application->RecallVar('email_queue_progress');
 
 		if ( $email_queue_progress === false ) {
 			$total_emails = $mailing_list_helper->getMessages(true);
 
 			$this->Application->StoreVar('email_queue_progress', $emails_sent . ':' . $total_emails);
 		}
 		else {
 			list ($emails_sent, $total_emails) = explode(':', $email_queue_progress);
 		}
 
 		$message_count = $mailing_list_helper->processQueue();
 
 		if ( !$message_count ) {
 			// no messages left to send in queue
 			$this->Application->RemoveVar('email_queue_progress');
 			$this->Application->Redirect($this->Application->GetVar('finish_template'));
 
 			return;
 		}
 
 		$emails_sent += $message_count;
 
 		if ( $emails_sent >= $total_emails ) {
 			$this->Application->RemoveVar('email_queue_progress');
 			$this->Application->Redirect($this->Application->GetVar('finish_template'));
 		}
 
 		$this->Application->StoreVar('email_queue_progress', $emails_sent . ':' . $total_emails);
 		$event->status = kEvent::erSTOP;
 
 		echo ($emails_sent / $total_emails) * 100;
 	}
 
 	/**
 	 * [SCHEDULED TASK] Process email queue from cron
 	 *
 	 * @param kEvent $event
 	 *
 	 * @return void
 	 */
 	protected function OnProcess(kEvent $event)
 	{
+		/** @var MailingListHelper $mailing_list_helper */
 		$mailing_list_helper = $this->Application->recallObject('MailingListHelper');
-		/* @var $mailing_list_helper MailingListHelper */
-
 		$mailing_list_helper->processQueue();
 	}
 }
Index: branches/5.3.x/core/units/user_profile/user_profile_eh.php
===================================================================
--- branches/5.3.x/core/units/user_profile/user_profile_eh.php	(revision 16518)
+++ branches/5.3.x/core/units/user_profile/user_profile_eh.php	(revision 16519)
@@ -1,122 +1,122 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class UserProfileEventHandler extends kDBEventHandler {
 
 		/**
 		 * Allows to override standard permission mapping
 		 *
 		 * @return void
 		 * @access protected
 		 * @see kEventHandler::$permMapping
 		 */
 		protected function mapPermissions()
 		{
 			parent::mapPermissions();
 
 			$permissions = Array (
 				'OnItemBuild'	=>	Array ('subitem' => true),
 				'OnUpdate'	=>	Array ('subitem' => true),
 			);
 
 			$this->permMapping = array_merge($this->permMapping, $permissions);
 		}
 
 		/**
 		 * Saves user profile to database
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnUpdate(kEvent $event)
 		{
 			$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
 			list ($user_id, $field_values) = each($items_info);
 
 			if ($user_id != $this->Application->RecallVar('user_id')) {
 				// we are not updating own profile
 				return ;
 			}
 
 			$public_profile_add = Array ();
 			$public_profile_remove = Array ();
 			$profile_mapping = $this->Application->getUnitConfig('u')->getUserProfileMapping();
 
 			foreach ($field_values as $variable_name => $variable_value) {
 				if (array_key_exists($variable_name, $profile_mapping)) {
 					// old style variable for displaying fields in public profile (named "pp_*")
 					if ($variable_value) {
 						$public_profile_add[] = $profile_mapping[$variable_name];
 					}
 					else {
 						$public_profile_remove[] = $profile_mapping[$variable_name];
 					}
 				}
 				else {
 					$this->Application->StorePersistentVar($variable_name, $this->Application->unescapeRequestVariable($variable_value));
 				}
 			}
 
 			if ($public_profile_add || $public_profile_remove) {
+				/** @var kDBItem $user */
 				$user = $this->Application->recallObject('u.current');
-				/* @var $user kDBItem */
 
 				// get current value
 				$display_to_public_old = $user->GetDBField('DisplayToPublic');
 				$display_to_public_new = $display_to_public_old ? explode('|', substr($display_to_public_old, 1, -1)) : Array ();
 
 				// update value
 				$display_to_public_new = array_diff(array_merge($display_to_public_new, $public_profile_add), $public_profile_remove);
 				$display_to_public_new = array_unique($display_to_public_new);
 				$display_to_public_new = $display_to_public_new ? '|' . implode('|', $display_to_public_new) . '|' : '';
 
 				if ($display_to_public_new != $display_to_public_old) {
 					$user->SetDBField('DisplayToPublic', $display_to_public_new);
 					$user->Update();
 				}
 			}
 		}
 
 		/**
 		 * Adds virtual fields for "Display To Public" fields.
 		 *
 		 * @param kEvent $event Event.
 		 *
 		 * @return void
 		 */
 		protected function OnAfterConfigRead(kEvent $event)
 		{
 			parent::OnAfterConfigRead($event);
 
 			$config = $event->getUnitConfig();
 			$profile_mapping = $this->Application->getUnitConfig('u')->getUserProfileMapping();
 
 			$virtual_fields = $config->getVirtualFields();
 
 			foreach ( array_keys($profile_mapping) as $field_name ) {
 				$virtual_fields[$field_name] = array(
 					'type' => 'int',
 					'formatter' => 'kOptionsFormatter', 'options' => array(1 => 'la_Yes', 2 => 'la_No'),
 					'use_phrases' => 1,
 					'default' => 0,
 				);
 			}
 
 			$config->setVirtualFields($virtual_fields);
 		}
 
 	}
Index: branches/5.3.x/core/units/user_profile/user_profile_tp.php
===================================================================
--- branches/5.3.x/core/units/user_profile/user_profile_tp.php	(revision 16518)
+++ branches/5.3.x/core/units/user_profile/user_profile_tp.php	(revision 16519)
@@ -1,161 +1,161 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class UserProfileTagProcessor extends kDBTagProcessor {
 
 		/**
 		 * Get's requested field value.
 		 *
 		 * @param array $params Tag params.
 		 *
 		 * @return string
 		 */
 		public function Field($params)
 		{
 			$field = $this->SelectParam($params, 'name,field');
 			$profile_mapping = $this->Application->getUnitConfig('u')->getUserProfileMapping();
 			$user_field = array_key_exists($field, $profile_mapping) ? $profile_mapping[$field] : false;
 
 			// Get field value to show on "Public Profile" page.
 			if ( array_key_exists('profile_field', $params) && $params['profile_field'] ) {
 				if ( $user_field ) {
 					$params['name'] = $user_field;
 				}
 
 				return $this->Application->ProcessParsedTag('u.profile', 'Field', $params);
 			}
 
 			if ( $user_field ) {
 				// Determine if field should be shown on "Public Profile" page (always checkbox).
 				$block_params = array('name' => 'DisplayToPublic', 'value' => $user_field);
 				$selected = $this->Application->ProcessParsedTag(
 					$this->getUserPrefixSpecial(),
 					'Selected',
 					$block_params
 				);
 				$value = $selected ? 1 : 0;
 			}
 			else {
 				// Custom user preference (can by field of any type) - fallback to persistent session storage.
 				$value = $this->recallUserProfileVar($field);
 				$selected = $value == 1;
 			}
 
 			if ( isset($params['checked']) && $params['checked'] ) {
 				return $selected ? 'checked' : '';
 			}
 
 			return $value;
 		}
 
 		/**
 		 * Returns prefix and special of user to operate with
 		 *
 		 * @return string
 		 */
 		function getUserPrefixSpecial()
 		{
 			return $this->Application->GetVar('user_id') ? 'u.profile' : 'u.current';
 		}
 
 		/**
 		 * Allows to get persistent var from other user
 		 *
 		 * @param string $var_name
 		 * @return mixed
 		 */
 		function recallUserProfileVar($var_name)
 		{
 			static $cache = null;
 
 			if (!isset($cache)) {
+				/** @var kDBItem $user */
 				$user = $this->Application->recallObject( $this->getUserPrefixSpecial() );
-				/* @var $user kDBItem */
 
 				$sql = 'SELECT VariableValue, VariableName
 						FROM ' . TABLE_PREFIX . 'UserPersistentSessionData
 						WHERE (PortalUserId = ' . $user->GetID() . ')';
 				$cache = $this->Conn->GetCol($sql, 'VariableName');
 			}
 
 			if (array_key_exists($var_name, $cache)) {
 				// get variable value from persistent session
 				return $cache[$var_name];
 			}
 			else {
 				// not found in persistent session -> get default value from config variable with same name
 				$config_value = $this->Application->ConfigValue($var_name);
 
 				if ($config_value !== false) {
 					return $config_value;
 				}
 			}
 
 			return false;
 		}
 
 
 
 		/**
 		 * Returns visible field count in user profile
 		 *
 		 * @param Array $params
 		 * @return int
 		 */
 		function ProfileFieldCount($params)
 		{
 			static $field_count = null;
 
 			if (!isset($field_count)) {
+				/** @var kDBItem $user */
 				$user = $this->Application->recallObject( $this->getUserPrefixSpecial() );
-				/* @var $user kDBItem */
 
 				$display_to_public = $user->GetDBField('DisplayToPublic');
 				$field_count = $display_to_public ? substr_count($display_to_public, '|') - 1 : 0;
 			}
 
 			return $field_count;
 		}
 
 		/**
 		 * Allows to detect that not all fields were shown
 		 *
 		 * @param Array $params
 		 * @return bool
 		 * @access protected
 		 */
 		protected function NotLastField($params)
 		{
 			$counter = (int)$this->Application->GetVar( $params['counter'] );
 
 			return $counter < $this->ProfileFieldCount($params);
 		}
 
 		/**
 		 * Because of persistent session table doesn't have ids, we use user id as id for each record
 		 *
 		 * @param Array $params
 		 * @return Array (id,field)
 		 * @access private
 		 */
 		function prepareInputName($params)
 		{
 			$params['force_id'] = $this->Application->RecallVar('user_id');
 
 			return parent::prepareInputName($params);
 		}
 
 	}
Index: branches/5.3.x/core/units/relationship/relationship_event_handler.php
===================================================================
--- branches/5.3.x/core/units/relationship/relationship_event_handler.php	(revision 16518)
+++ branches/5.3.x/core/units/relationship/relationship_event_handler.php	(revision 16519)
@@ -1,310 +1,310 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class RelationshipEventHandler extends kDBEventHandler
 	{
 		/**
 		 * Allows to override standard permission mapping
 		 *
 		 * @return void
 		 * @access protected
 		 * @see kEventHandler::$permMapping
 		 */
 		protected function mapPermissions()
 		{
 			parent::mapPermissions();
 
 			$permissions = Array (
 				'OnProcessSelected' => Array ('subitem' => 'add|edit')
 			);
 
 			$this->permMapping = array_merge($this->permMapping, $permissions);
 		}
 
 		/**
 		 * Initializes new relation
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnNew(kEvent $event)
 		{
 			parent::OnNew($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$table_info = $object->getLinkedInfo();
 
 			$object->SetDBField('SourceId', $table_info['ParentId']);
 			$source_item_type = $this->Application->getUnitConfig($table_info['ParentPrefix'])->getItemType();
 			$object->SetDBField('SourceType', $source_item_type);
 
 			$object->SetDBField('TargetId', $this->Application->GetVar('target_id'));
 			$object->SetDBField('TargetType', $this->Application->GetVar('target_type'));
 
 			$this->OnAfterItemLoad($event);
 		}
 
 		/**
 		 * Add new relation
 		 *
 		 * @param kEvent $event
 		 */
 		function OnProcessSelected($event)
 		{
 			$dst_field = $this->Application->RecallVar('dst_field');
 
 			if ( $dst_field == 'TargetId' ) {
 				// prepare target_id & target_type
 				$object = $event->getObject(Array ('skip_autoload' => true));
 
 				$target_id = 0;
 				$target_prefix = false;
 				$selected_ids = $this->Application->GetVar('selected_ids');
 
 				foreach ($selected_ids as $selected_prefix => $target_id) {
 					if ( $target_id > 0 ) {
 						$target_prefix = $selected_prefix;
 						break;
 					}
 				}
 
 				if ( !$target_prefix ) {
 					$event->SetRedirectParam('opener', 'u');
 					return;
 				}
 
 				$target_config = $this->Application->getUnitConfig($target_prefix);
 
 				$sql = 'SELECT ResourceId
 						FROM ' . $target_config->getTableName() . '
 						WHERE ' . $target_config->getIDField() . ' IN (' . $target_id . ')';
 				$target_id = $this->Conn->GetOne($sql);
 				$target_type = $target_config->getItemType();
 
 				// don't add same relation twice
 				$table_info = $object->getLinkedInfo();
 				$sql = 'SELECT TargetId
 						FROM ' . $object->TableName . '
 						WHERE (SourceId = ' . $table_info['ParentId'] . ') AND (TargetId = ' . $target_id . ')';
 				$duplicate_relation = $this->Conn->GetOne($sql) == $target_id;
 
 				$event->SetRedirectParam('opener', 'u');
 
 				if ( !$duplicate_relation ) {
 					// place correct template in opener stack
 					$source_prefix = $event->getUnitConfig()->getParentPrefix();
 					$template = $this->Application->getUnitConfig($source_prefix)->getAdminTemplatePath() . '/relations_edit';
 
 					$redirect_params = Array (
 						$event->Prefix . '_event' => 'OnNew',
 						'target_id' => $target_id,
 						'm_opener' => 's',
 						'target_type' => $target_type,
 						'pass' => 'all,' . $event->Prefix,
 					);
 
 					$this->Application->EventManager->openerStackPush($template, $redirect_params);
 				}
 			}
 			else {
 				$event->SetRedirectParam('opener', 'u');
 			}
 		}
 
 		/**
 		 * Set ItemName & ItemType virtual fields based on loaded item data
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemLoad(kEvent $event)
 		{
 			parent::OnAfterItemLoad($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$sql = 'SELECT Prefix
 					FROM ' . TABLE_PREFIX . 'ItemTypes
 					WHERE ItemType = ' . $object->GetDBField('TargetType');
 			$target_config = $this->Application->getUnitConfig($this->Conn->GetOne($sql));
 
 			$title_field = $this->getTitleField($target_config);
 			$title_phrase = $target_config->getTitlePhrase();
 
 			$sql = 'SELECT ' . $title_field . '
 					FROM ' . $target_config->getTableName() . '
 					WHERE ResourceId = ' . $object->GetDBField('TargetId');
 
 			$object->SetDBField('ItemName', $this->Conn->GetOne($sql));
 			$object->SetDBField('ItemType', $this->Application->Phrase($title_phrase));
 		}
 
 		/**
 		 * Creates needed sql query to load list,
 		 * if no query is defined in config for
 		 * special requested, then use default
 		 * query
 		 *
 		 * @param kEvent $event
 		 * @return string
 		 * @access protected
 		 */
 		protected function ListPrepareQuery(kEvent $event)
 		{
 			return $this->BaseQuery($event, 'ListSQLs');
 		}
 
 		/**
 		 * Creates needed sql query to load item,
 		 * if no query is defined in config for
 		 * special requested, then use list query
 		 *
 		 * @param kEvent $event
 		 * @return string
 		 * @access protected
 		 */
 		protected function ItemPrepareQuery(kEvent $event)
 		{
 			return $this->BaseQuery($event, 'ItemSQLs');
 		}
 
 
 		/**
 		 * Get item name & type based on relation type & modules installed
 		 *
 		 * @param kEvent $event
 		 * @param string $sql_field
 		 */
 		function BaseQuery($event, $sql_field)
 		{
 			$sqls = $event->getUnitConfig()->getSetting($sql_field);
 			$sql = isset($sqls[$event->Special]) ? $sqls[$event->Special] : $sqls[''];
 
 			$configs = $this->extractModulesInfo();
 
 			// 2. build sql based on information queried
 			$sql_templates['ItemName'] = 'IFNULL(%s.%s,\' \')';
 			$sql_templates['TableJoin'] = 'LEFT JOIN %1$s ON %1$s.ResourceId = rel.TargetId';
 			$sql_templates['TargetName'] = 'IF(rel.TargetType = %s, \'%s\', %s)';
 
 			$sql_parts = Array ();
 			$sql_parts['TargetName'] = "''";
 
 			foreach ($configs as $config) {
 				$title_field = $this->getTitleField($config);
 
 				$sql_parts['ItemName'][] = sprintf($sql_templates['ItemName'], $config->getTableName(), $title_field);
 				$sql_parts['TableJoin'][] = sprintf($sql_templates['TableJoin'], $config->getTableName());
 
 				$sql_parts['TargetName'] = sprintf($sql_templates['TargetName'], $config->getItemType(), '!' . $config->getTitlePhrase() . '!', $sql_parts['TargetName']);
 				$sql_parts['TargetName'] = str_replace('rel', '%1$s', $sql_parts['TargetName']);
 			}
 
 			$object = $event->getObject();
 
 			$vars = Array ('#ITEM_NAMES#', '#ITEM_TYPES#');
 			$replacements = Array (implode(', ', $sql_parts['ItemName']), $sql_parts['TargetName']);
 
 			$calculated_fields = $object->getCalculatedFields();
 
 			foreach ($calculated_fields as $field_name => $field_expression) {
 				$calculated_fields[$field_name] = str_replace($vars, $replacements, $field_expression);
 			}
 
 			$object->setCalculatedFields($calculated_fields);
 
 			$sql = str_replace('#ITEM_JOIN#', implode(' ', $sql_parts['TableJoin']), $sql);
 			$sql = str_replace('rel.', '%1$s.', $sql);
 
 			return $sql;
 		}
 
 		/**
 		 * Convert TitleField field of kMultiLanguage formatter used for it
 		 *
 		 * @param kUnitConfig $config
 		 * @return string
 		 */
 		function getTitleField(kUnitConfig $config)
 		{
 			$lang_prefix = 'l' . $this->Application->GetVar('m_lang') . '_';
 
 			$title_field = $config->getTitleField();
 			$field_options = $config->getFieldByName($title_field);
 
 			$formatter_class = isset($field_options['formatter']) ? $field_options['formatter'] : '';
 
 			if ( $formatter_class == 'kMultiLanguage' && !isset($field_options['master_field']) ) {
 				$title_field = $lang_prefix . $title_field;
 			}
 
 			return $title_field;
 		}
 
 		/**
 		 * Get configs from modules installed
 		 *
 		 * @return Array|kUnitConfig[]
 		 * @access private
 		 */
 		function extractModulesInfo()
 		{
 			// get installed modules & their config info
 			// maybe we should leave only prefixes, that have "view" permission
 			$ret = Array ();
 
 			foreach ($this->Application->ModuleInfo as $module_data) {
 				$prefix = $module_data['Var'];
 
 				if ( $prefix == 'm' ) {
 					$prefix = 'c';
 				}
 
 				if ( !$this->Application->prefixRegistred($prefix) ) {
 					continue;
 				}
 
 				$config = $this->Application->getUnitConfig($prefix);
 
 				if ( $config->getCatalogItem() ) {
 					$ret[$prefix] = $config;
 				}
 			}
 
 			return $ret;
 		}
 
 		/**
 		 * Deletes relations to hooked item from other items
 		 *
 		 * @param kEvent $event
 		 */
 		function OnDeleteForeignRelations($event)
 		{
+			/** @var kDBItem $main_object */
 			$main_object = $event->MasterEvent->getObject();
-			/* @var $main_object kDBItem */
 
 			$sql = 'DELETE FROM ' . $event->getUnitConfig()->getTableName() . '
 					WHERE TargetId = ' . $main_object->GetDBField('ResourceId');
 			$this->Conn->Query($sql);
 		}
 
 	}
\ No newline at end of file
Index: branches/5.3.x/core/units/captcha/captcha_eh.php
===================================================================
--- branches/5.3.x/core/units/captcha/captcha_eh.php	(revision 16518)
+++ branches/5.3.x/core/units/captcha/captcha_eh.php	(revision 16519)
@@ -1,47 +1,47 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class CaptchaEventHandler extends kEventHandler {
 
 		/**
 		 * [HOOK] Validates captcha code in item
 		 *
 		 * @param kEvent $event
 		 */
 		function OnValidateCode($event)
 		{
+			/** @var kCaptchaHelper $captcha_helper */
 			$captcha_helper = $this->Application->recallObject('CaptchaHelper');
-			/* @var $captcha_helper kCaptchaHelper */
 
 			$captcha_helper->validateCode($event->MasterEvent);
 		}
 
 		/**
 		 * [HOOK] Initializes captcha code processing routine
 		 *
 		 * @param kEvent $event
 		 */
 		function OnPrepareCaptcha($event)
 		{
+			/** @var kCaptchaHelper $captcha_helper */
 			$captcha_helper = $this->Application->recallObject('CaptchaHelper');
-			/* @var $captcha_helper kCaptchaHelper */
 
 			// create field for captcha code storage
 			$event->MasterEvent->getUnitConfig()->addVirtualFields(Array (
 				'Captcha' => Array ('type' => 'string', 'default' => ''),
 			));
 		}
 	}
Index: branches/5.3.x/core/units/phrases/phrases_event_handler.php
===================================================================
--- branches/5.3.x/core/units/phrases/phrases_event_handler.php	(revision 16518)
+++ branches/5.3.x/core/units/phrases/phrases_event_handler.php	(revision 16519)
@@ -1,593 +1,593 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class PhrasesEventHandler extends kDBEventHandler
 	{
 		/**
 		 * Allows to override standard permission mapping
 		 *
 		 * @return void
 		 * @access protected
 		 * @see kEventHandler::$permMapping
 		 */
 		protected function mapPermissions()
 		{
 			parent::mapPermissions();
 
 			$permissions = Array (
 				'OnItemBuild' => Array ('self' => true, 'subitem' => true),
 				'OnPreparePhrase' => Array ('self' => true, 'subitem' => true),
 				'OnExportPhrases' => Array ('self' => 'view'),
 			);
 
 			$this->permMapping = array_merge($this->permMapping, $permissions);
 		}
 
 		/**
 		 * Hides phrases from disabled modules
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			$object->addFilter('module_filter', '%1$s.Module IN (SELECT Name FROM ' . TABLE_PREFIX . 'Modules WHERE Loaded = 1)');
 		}
 
 		/**
 		 * Apply some special processing to object being
 		 * recalled before using it in other events that
 		 * call prepareObject
 		 *
 		 * @param kDBItem|kDBList $object
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function prepareObject(&$object, kEvent $event)
 		{
 			// don't call parent
 			if ( $event->Special == 'import' || $event->Special == 'export' ) {
 				$this->RemoveRequiredFields($object);
 				$object->setRequired(Array ('ExportDataTypes', 'LangFile', 'PhraseType', 'Module'));
 
 				// allow multiple phrase types to be selected during import/export
 				$object->SetFieldOption('PhraseType', 'type', 'string');
 			}
 		}
 
 		/**
 		 * Allow to create phrases from front end in debug mode with DBG_PHRASES constant set
 		 *
 		 * @param kEvent $event
 		 * @return bool
 		 * @access public
 		 */
 		public function CheckPermission(kEvent $event)
 		{
 			if ( !$this->Application->isAdmin && $this->Application->isDebugMode(false) && kUtil::constOn('DBG_PHRASES') ) {
 				$allow_events = Array ('OnCreate', 'OnCreateAjax', 'OnUpdate', 'OnUpdateAjax');
 
 				if ( in_array($event->Name, $allow_events) ) {
 					return true;
 				}
 			}
 
 			return parent::CheckPermission($event);
 		}
 
 		/**
 		 * Prepares phrase for translation
 		 *
 		 * @param kEvent $event
 		 */
 		function OnPreparePhrase($event)
 		{
 			$label = $this->Application->GetVar($event->getPrefixSpecial() . '_label');
 
 			if (!$label) {
 				return ;
 			}
 
 			// we got label, try to get it's ID then if any
 			$phrase_id = $this->_getPhraseId($label);
 
 			if ($phrase_id) {
 				$event->SetRedirectParam($event->getPrefixSpecial(true) . '_id', $phrase_id);
 				$event->SetRedirectParam('pass', 'm,' . $event->getPrefixSpecial());
 
 				$next_template = $this->Application->GetVar('next_template');
 
 				if ($next_template) {
 					$event->SetRedirectParam('next_template', $next_template);
 				}
 			}
 			else {
 				$event->CallSubEvent('OnNew');
 			}
 
 			if ($this->Application->GetVar('simple_mode')) {
 				$event->SetRedirectParam('simple_mode', 1);
 			}
 		}
 
 		function _getPhraseId($phrase)
 		{
 			$config = $this->getUnitConfig();
 
 			$sql = 'SELECT ' . $config->getIDField() . '
 					FROM ' . $config->getTableName() . '
 					WHERE PhraseKey = ' . $this->Conn->qstr( mb_strtoupper($phrase) );
 
 			return $this->Conn->GetOne($sql);
 		}
 
 		/**
 		 * Sets phrase type based on place where it's created (to display on form only)
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnPreCreate(kEvent $event)
 		{
 			parent::OnPreCreate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$this->_setPhraseModule($object);
 		}
 
 		/**
 		 * Forces new label in case if issued from get link
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnNew(kEvent $event)
 		{
 			parent::OnNew($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$label = $this->Application->GetVar($event->getPrefixSpecial() . '_label');
 
 			if ( $label ) {
 				// phrase is created in language, used to display phrases
 				$object->SetDBField('Phrase', $label);
 				$object->SetDBField('PhraseType', $this->_getPhraseType($label)); // to show on form
 				$object->SetDBField('PrimaryTranslation', $this->_getPrimaryTranslation($label));
 			}
 
 			$this->_setPhraseModule($object);
 
 			if ( $event->Special == 'export' || $event->Special == 'import' ) {
 				$object->SetDBField('PhraseType', '|0|1|2|');
 				$object->SetDBField('Module', '|' . implode('|', array_keys($this->Application->ModuleInfo)) . '|');
 
 				$export_mode = $this->Application->GetVar('export_mode');
 
 				if ( $export_mode != 'lang' ) {
 					$object->SetDBField('ExportDataTypes', '|' . $export_mode . '|');
 				}
 			}
 		}
 
 		/**
 		 * Returns given phrase translation on primary language
 		 *
 		 * @param string $phrase
 		 * @return string
 		 * @access protected
 		 */
 		protected function _getPrimaryTranslation($phrase)
 		{
 			$sql = 'SELECT l' . $this->Application->GetDefaultLanguageId() . '_Translation
 					FROM ' . $this->getUnitConfig()->getTableName() . '
 					WHERE PhraseKey = ' . $this->Conn->qstr( mb_strtoupper($phrase) );
 
 			return $this->Conn->GetOne($sql);
 		}
 
 		/**
 		 * Sets new phrase module
 		 *
 		 * @param kDBItem $object
 		 * @return void
 		 * @access protected
 		 */
 		protected function _setPhraseModule(&$object)
 		{
 			$last_module = $this->Application->GetVar('last_module');
 
 			if ( $last_module ) {
 				$object->SetDBField('Module', $last_module);
 			}
 		}
 
 		/**
 		 * Forces create to use live table
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnCreate(kEvent $event)
 		{
 			if ( $this->Application->GetVar($event->Prefix . '_label') ) {
+				/** @var kDBItem $object */
 				$object = $event->getObject(Array ('skip_autoload' => true));
-				/* @var $object kDBItem */
 
 				if ( $this->Application->GetVar('m_lang') != $this->Application->GetVar('lang_id') ) {
 					$object->SwitchToLive();
 				}
 
 				$this->returnToOriginalTemplate($event);
 			}
 
 			parent::OnCreate($event);
 		}
 
 		/**
 		 * Processes items create from ajax request
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnCreateAjax(kEvent $event)
 		{
+			/** @var AjaxFormHelper $ajax_form_helper */
 			$ajax_form_helper = $this->Application->recallObject('AjaxFormHelper');
-			/* @var $ajax_form_helper AjaxFormHelper */
 
 			$ajax_form_helper->transitEvent($event, 'OnCreate');
 		}
 
 		/**
 		 * Redirects to original template after phrase is being update
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnUpdate(kEvent $event)
 		{
 			if ( $this->Application->GetVar($event->Prefix . '_label') ) {
 				$this->returnToOriginalTemplate($event);
 			}
 
 			parent::OnUpdate($event);
 		}
 
 		/**
 		 * Processes items update from ajax request
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnUpdateAjax(kEvent $event)
 		{
+			/** @var AjaxFormHelper $ajax_form_helper */
 			$ajax_form_helper = $this->Application->recallObject('AjaxFormHelper');
-			/* @var $ajax_form_helper AjaxFormHelper */
 
 			$ajax_form_helper->transitEvent($event, 'OnUpdate');
 		}
 
 		/**
 		 * Returns to original template after phrase adding/editing
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function returnToOriginalTemplate(kEvent $event)
 		{
 			$next_template = $this->Application->GetVar('next_template');
 
 			if ( $next_template ) {
 				$event->redirect = $next_template;
 				$event->SetRedirectParam('opener', 's');
 			}
 		}
 
 		/**
 		 * Set last change info, when phrase is created
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemCreate(kEvent $event)
 		{
 			parent::OnBeforeItemCreate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$primary_language_id = $this->Application->GetDefaultLanguageId();
 
 			if ( !$object->GetDBField('l' . $primary_language_id . '_Translation') ) {
 				// no translation on primary language -> try to copy from other language
 				$src_languages = Array ('lang_id', 'm_lang'); // editable language, theme language
 
 				foreach ($src_languages as $src_language) {
 					$src_language = $this->Application->GetVar($src_language);
 					$src_value = $src_language ? $object->GetDBField('l' . $src_language . '_Translation') : false;
 
 					if ( $src_value ) {
 						$object->SetDBField('l' . $primary_language_id . '_Translation', $src_value);
 						break;
 					}
 				}
 			}
 
 			$this->_phraseChanged($event);
 		}
 
 		/**
 		 * Update last change info, when phrase is updated
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemUpdate(kEvent $event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
 			$this->_phraseChanged($event);
 		}
 
 		/**
 		 * Set's phrase key and last change info, used for phrase updating and loading
 		 *
 		 * @param kEvent $event
 		 */
 		function _phraseChanged($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$label = $object->GetDBField('Phrase');
 			$object->SetDBField('PhraseKey', mb_strtoupper($label));
 			$object->SetDBField('PhraseType', $this->_getPhraseType($label));
 
 			if ( $this->translationChanged($object) ) {
 				$object->SetDBField('LastChanged_date', time() );
 				$object->SetDBField('LastChanged_time', time() );
 				$object->SetDBField('LastChangeIP', $this->Application->getClientIp());
 			}
 
 			$this->Application->Session->SetCookie('last_module', $object->GetDBField('Module'));
 		}
 
 		/**
 		 * Returns phrase type, that corresponds given phrase label
 		 *
 		 * @param string $label
 		 * @return int
 		 * @access protected
 		 */
 		protected function _getPhraseType($label)
 		{
 			$phrase_type_map = Array (
 				'LU' => Language::PHRASE_TYPE_FRONT,
 				'LA' => Language::PHRASE_TYPE_ADMIN,
 				'LC' => Language::PHRASE_TYPE_COMMON
 			);
 
 			$label = mb_strtoupper($label);
 			$label_prefix = substr($label, 0, 2);
 
 			return isset($phrase_type_map[$label_prefix]) ? $phrase_type_map[$label_prefix] : Language::PHRASE_TYPE_COMMON;
 		}
 
 		/**
 		 * Checks, that at least one of phrase's translations was changed
 		 *
 		 * @param kDBItem $object
 		 * @return bool
 		 */
 		function translationChanged(&$object)
 		{
 			$translation_fields = $this->getTranslationFields();
 			$changed_fields = array_keys( $object->GetChangedFields() );
 
 			foreach ($changed_fields as $changed_field) {
 				$changed_field = preg_replace('/^l[\d]+_/', '', $changed_field);
 
 				if ( in_array($changed_field, $translation_fields) ) {
 					return true;
 				}
 			}
 
 			return false;
 		}
 
 		/**
 		 * Returns fields, that can be translated
 		 *
 		 * @return Array
 		 * @access protected
 		 */
 		protected function getTranslationFields()
 		{
 			return Array ('Translation', 'HintTranslation', 'ColumnTranslation');
 		}
 
 		/**
 		 * Put correct translation to source language fields
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemLoad(kEvent $event)
 		{
 			parent::OnAfterItemLoad($event);
 
 			$object = $event->getObject();
 			/* @var $object kDBItem */
 
 			$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
 			/* @var $ml_helper kMultiLanguageHelper */
 
 			$translation_fields = $this->getTranslationFields();
 			$source_language = $ml_helper->getSourceLanguage($object->GetDBField('TranslateFromLanguage'));
 
 			foreach ($translation_fields as $translation_field) {
 				$object->SetDBField('Source' . $translation_field, $object->GetDBField('l' . $source_language . '_' . $translation_field));
 			}
 		}
 
 		/**
 		 * Changes default module to custom (when available)
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterConfigRead(kEvent $event)
 		{
 			parent::OnAfterConfigRead($event);
 
 			if ( $this->Application->findModule('Name', 'Custom') ) {
 				$config = $event->getUnitConfig();
 
 				$fields = $config->getFields();
 				$fields['Module']['default'] = 'Custom';
 				$config->setFields($fields);
 			}
 
 			$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
 			/* @var $ml_helper kMultiLanguageHelper */
 
 			$ml_helper->replaceMLCalculatedFields($event);
 
 			if ( $this->Application->GetVar('regional') ) {
 				$event->getUnitConfig()->setPopulateMlFields(true);
 			}
 		}
 
 		/**
 		 * Saves changes & changes language
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnPreSaveAndChangeLanguage(kEvent $event)
 		{
 			$label = $this->Application->GetVar($event->getPrefixSpecial() . '_label');
 
 			if ( $label && !$this->UseTempTables($event) ) {
 				$phrase_id = $this->_getPhraseId($label);
 
 				if ( $phrase_id ) {
 					$event->CallSubEvent('OnUpdate');
 					$event->SetRedirectParam('opener', 's');
 				}
 				else {
 					$event->CallSubEvent('OnCreate');
 					$event->SetRedirectParam('opener', 's');
 				}
 
 				if ( $event->status != kEvent::erSUCCESS ) {
 					return;
 				}
 
 				$event->SetRedirectParam($event->getPrefixSpecial() . '_event', 'OnPreparePhrase');
 				$event->SetRedirectParam('pass_events', true);
 			}
 
 			if ( $this->Application->GetVar('simple_mode') ) {
 				$event->SetRedirectParam('simple_mode', 1);
 			}
 
 			parent::OnPreSaveAndChangeLanguage($event);
 		}
 
 		/**
 		 * Prepare temp tables and populate it
 		 * with items selected in the grid
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnEdit(kEvent $event)
 		{
 			parent::OnEdit($event);
 
 			// use language from grid, instead of primary language used by default
 			$event->SetRedirectParam('m_lang', $this->Application->GetVar('m_lang'));
 		}
 
 		/**
 		 * Stores ids of selected phrases and redirects to export language step 1
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnExportPhrases(kEvent $event)
 		{
 			if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
 				$event->status = kEvent::erFAIL;
 				return;
 			}
 
 			$this->Application->getUnitConfig('phrases')->setAutoLoad(false);
 
 			$this->StoreSelectedIDs($event);
 			$this->Application->StoreVar('export_language_ids', $this->Application->GetVar('m_lang'));
 
 			$event->setRedirectParams(
 				Array (
 					'phrases.export_event' => 'OnNew',
 					'pass' => 'all,phrases.export',
 					'export_mode' => $event->Prefix,
 				)
 			);
 		}
 
 		/**
 		 * Updates translation state for all saved phrases
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeCopyToLive(kEvent $event)
 		{
 			parent::OnBeforeCopyToLive($event);
 
 			$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
 			/* @var $ml_helper kMultiLanguageHelper */
 
 			$ml_helper->updateTranslationState($event);
 		}
 	}
Index: branches/5.3.x/core/units/email_templates/email_template_eh.php
===================================================================
--- branches/5.3.x/core/units/email_templates/email_template_eh.php	(revision 16518)
+++ branches/5.3.x/core/units/email_templates/email_template_eh.php	(revision 16519)
@@ -1,741 +1,741 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class EmailTemplateEventHandler extends kDBEventHandler
 	{
 		/**
 		 * Allows to override standard permission mapping
 		 *
 		 * @return void
 		 * @access protected
 		 * @see kEventHandler::$permMapping
 		 */
 		protected function mapPermissions()
 		{
 			parent::mapPermissions();
 
 			$permissions = Array (
 				'OnFrontOnly' => Array ('self' => 'edit'),
 				'OnSaveSelected' => Array ('self' => 'view'),
 				'OnExportEmailTemplates' => Array ('self' => 'view'),
 
 				'OnSuggestAddressJSON' => Array ('self' => 'add|edit'),
 
 				// events only for developers
 				'OnPreCreate' => Array ('self' => 'debug'),
 				'OnDelete' => Array ('self' => 'debug'),
 				'OnDeleteAll' => Array ('self' => 'debug'),
 				'OnMassDelete' => Array ('self' => 'debug'),
 				'OnMassApprove' => Array ('self' => 'debug'),
 				'OnMassDecline' => Array ('self' => 'debug'),
 				'OnSend' => Array ('self' => 'debug'),
 			);
 
 			$this->permMapping = array_merge($this->permMapping, $permissions);
 		}
 
 		/**
 		 * Changes permission section to one from REQUEST, not from config
 		 *
 		 * @param kEvent $event
 		 * @return bool
 		 * @access public
 		 */
 		public function CheckPermission(kEvent $event)
 		{
 			$module = $this->Application->GetVar('module');
 
 			if ( strlen($module) > 0 ) {
 				// checking permission when listing module email events in separate section
 				$module = explode(':', $module, 2);
 
 				if ( count($module) == 1 ) {
 					$main_prefix = $this->Application->findModule('Name', $module[0], 'Var');
 				}
 				else {
 					$exceptions = Array ('Category' => 'c', 'Users' => 'u');
 					$main_prefix = $exceptions[$module[1]];
 				}
 				$section = $this->Application->getUnitConfig($main_prefix)->getPermSectionByName('email');
 
 				$event->setEventParam('PermSection', $section);
 			}
 
 			// checking permission when listing all email events when editing language
 			return parent::CheckPermission($event);
 		}
 
 		/**
 		 * Apply any custom changes to list's sql query
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
 		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			if ( $event->Special == 'module' ) {
 				$module = $this->Application->GetVar('module');
 				$object->addFilter('module_filter', '%1$s.Module = ' . $this->Conn->qstr($module));
 			}
 			else {
 				$object->addFilter('module_filter', '%1$s.Module IN (SELECT Name FROM ' . TABLE_PREFIX . 'Modules WHERE Loaded = 1)');
 			}
 
 			if ( !$event->Special && !$this->Application->isDebugMode() ) {
 				// no special
 				$object->addFilter('enabled_filter', '%1$s.Enabled <> ' . STATUS_DISABLED);
 			}
 		}
 
 		/**
 		 * Prepares new kDBItem object
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnNew(kEvent $event)
 		{
 			parent::OnNew($event);
 
 			$mapping = Array ('conf' => 'VariableValue', 'site-domain' => 'DefaultEmailRecipients');
 
 			if ( isset($mapping[$event->Special]) ) {
+				/** @var kDBItem $object */
 				$object = $event->getObject();
-				/* @var $object kDBItem */
 
+				/** @var kDBList $target_object */
 				$target_object = $this->Application->recallObject($event->Special);
-				/* @var $target_object kDBList */
 
 				$object->SetDBField('Recipients', $target_object->GetDBField($mapping[$event->Special]));
 			}
 		}
 
 		/**
 		 * Set default headers
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnPreCreate(kEvent $event)
 		{
 			parent::OnPreCreate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$object->SetDBField('Headers', $this->Application->ConfigValue('Smtp_DefaultHeaders'));
 			$this->setRequired($event);
 		}
 
 		/**
 		 * Sets status Front-End Only to selected email events
 		 *
 		 * @param kEvent $event
 		 */
 		function OnFrontOnly($event)
 		{
 			if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
 				$event->status = kEvent::erFAIL;
 				return;
 			}
 
 			$config = $event->getUnitConfig();
 
 			$sql = 'UPDATE ' . $config->getTableName() . '
 					SET FrontEndOnly = 1
 					WHERE ' . $config->getIDField() . ' IN (' . implode(',', $this->StoreSelectedIDs($event)) . ')';
 			$this->Conn->Query($sql);
 
 			$this->clearSelectedIDs($event);
 		}
 
 		/**
 		 * Sets selected user to email events selected
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnSelectUser(kEvent $event)
 		{
 			if ( $event->Special != 'module' ) {
 				parent::OnSelectUser($event);
 				return;
 			}
 
 			if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
 				$event->status = kEvent::erFAIL;
 				return;
 			}
 
 			$items_info = $this->Application->GetVar('u');
 			if ( $items_info ) {
 				list ($user_id, ) = each($items_info);
 
 				$config = $event->getUnitConfig();
 				$ids = $this->Application->RecallVar($event->getPrefixSpecial() . '_selected_ids');
 
 				$sql = 'UPDATE ' . $config->getTableName() . '
 						SET ' . $this->Application->RecallVar('dst_field') . ' = ' . $user_id . '
 						WHERE ' . $config->getIDField() . ' IN (' . $ids . ')';
 				$this->Conn->Query($sql);
 			}
 
 			$this->finalizePopup($event);
 		}
 
 		/**
 		 * Saves selected ids to session
 		 *
 		 * @param kEvent $event
 		 */
 		function OnSaveSelected($event)
 		{
 			$this->StoreSelectedIDs($event);
 		}
 
 		/**
 		 * Prefills module dropdown
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterConfigRead(kEvent $event)
 		{
 			parent::OnAfterConfigRead($event);
 
 			$config = $event->getUnitConfig();
 
 			$fields = $config->getFields();
 			$fields['Module']['options'] = $this->_getModules();
 
 			if ( $this->Application->findModule('Name', 'Custom') ) {
 				$fields['Module']['default'] = 'Custom';
 			}
 
 			$config->setFields($fields);
 
 			$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
 			/* @var $ml_helper kMultiLanguageHelper */
 
 			$ml_helper->replaceMLCalculatedFields($event);
 
 			if ( $this->Application->GetVar('regional') ) {
 				$config->setPopulateMlFields(true);
 			}
 		}
 
 		/**
 		 * Returns modules, where e-mail event can be added to
 		 *
 		 * @return Array
 		 * @access protected
 		 */
 		protected function _getModules()
 		{
 			$ret = Array ();
 
 			foreach ($this->Application->ModuleInfo as $module_name => $module_info) {
 				if ( $module_name == 'In-Portal' ) {
 					continue;
 				}
 
 				$ret[$module_name] = $module_name;
 			}
 
 			return $ret;
 		}
 
 		/**
 		 * Prepare temp tables and populate it
 		 * with items selected in the grid
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnEdit(kEvent $event)
 		{
 			parent::OnEdit($event);
 
 			// use language from grid, instead of primary language used by default
 			$event->SetRedirectParam('m_lang', $this->Application->GetVar('m_lang'));
 		}
 
 		/**
 		 * Fixes default recipient type
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemLoad(kEvent $event)
 		{
 			parent::OnAfterItemLoad($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			if ( !$this->Application->isDebugMode(false) ) {
 				if ( $object->GetDBField('AllowChangingRecipient') ) {
 					$object->SetDBField('RecipientType', EmailTemplate::RECIPIENT_TYPE_TO);
 				}
 				else {
 					$object->SetDBField('RecipientType', EmailTemplate::RECIPIENT_TYPE_CC);
 				}
 			}
 
 			// process replacement tags
 			$records = Array ();
 			$replacement_tags = $object->GetDBField('ReplacementTags');
 			$replacement_tags = $replacement_tags ? unserialize($replacement_tags) : Array ();
 
 			foreach ($replacement_tags as $tag => $replacement) {
 				$records[] = Array ('Tag' => $tag, 'Replacement' => $replacement);
 			}
 
+			/** @var MInputHelper $minput_helper */
 			$minput_helper = $this->Application->recallObject('MInputHelper');
-			/* @var $minput_helper MInputHelper */
 
 			$xml = $minput_helper->prepareMInputXML($records, Array ('Tag', 'Replacement'));
 			$object->SetDBField('ReplacementTagsXML', $xml);
 
 			$this->setRequired($event);
 
 			$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
 			/* @var $ml_helper kMultiLanguageHelper */
 
 			$translation_fields = $this->getTranslationFields();
 			$source_language = $ml_helper->getSourceLanguage($object->GetDBField('TranslateFromLanguage'));
 
 			foreach ($translation_fields as $translation_field) {
 				$object->SetDBField('Source' . $translation_field, $object->GetDBField('l' . $source_language . '_' . $translation_field));
 			}
 		}
 
 		/**
 		 * Performs custom validation + keep read-only fields
 		 *
 		 * @param kEvent $event
 		 */
 		function _itemChanged($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			if ( !$this->Application->isDebugMode(false) ) {
 				// only allow to enable/disable event while in debug mode
 				$to_restore = Array ('Enabled', 'AllowChangingSender', 'AllowChangingRecipient');
 
 				if ( !$object->GetOriginalField('AllowChangingSender') ) {
 					$to_restore = array_merge($to_restore, Array ('CustomSender', 'SenderName', 'SenderAddressType', 'SenderAddress'));
 				}
 
 				if ( !$object->GetOriginalField('AllowChangingRecipient') ) {
 					$to_restore = array_merge($to_restore, Array ('CustomRecipient' /*, 'Recipients'*/));
 				}
 
 				// prevent specific fields from editing
 				foreach ($to_restore as $restore_field) {
 					$original_value = $object->GetOriginalField($restore_field);
 
 					if ( $object->GetDBField($restore_field) != $original_value ) {
 						$object->SetDBField($restore_field, $original_value);
 					}
 				}
 			}
 
 			// process replacement tags
 			if ( $object->GetDBField('ReplacementTagsXML') ) {
+				/** @var MInputHelper $minput_helper */
 				$minput_helper = $this->Application->recallObject('MInputHelper');
-				/* @var $minput_helper MInputHelper */
 
 				$replacement_tags = Array ();
 				$records = $minput_helper->parseMInputXML($object->GetDBField('ReplacementTagsXML'));
 
 				foreach ($records as $record) {
 					$replacement_tags[trim($record['Tag'])] = trim($record['Replacement']);
 				}
 
 				$object->SetDBField('ReplacementTags', $replacement_tags ? serialize($replacement_tags) : NULL);
 			}
 
 			if ( $this->translationChanged($object) ) {
 				$object->SetDBField('LastChanged_date', TIMENOW);
 				$object->SetDBField('LastChanged_time', TIMENOW);
 			}
 
 			$this->setRequired($event);
 		}
 
 		/**
 		 * Dynamically changes required fields
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function setRequired(kEvent $event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$language_prefix = 'l' . $this->Application->GetVar('m_lang') . '_';
 
 			$object->setRequired($language_prefix . 'HtmlBody', !$object->GetField('PlainTextBody'));
 			$object->setRequired($language_prefix . 'PlainTextBody', !$object->GetField('HtmlBody'));
 		}
 
 		/**
 		 * Checks, that at least one of phrase's translations was changed
 		 *
 		 * @param kDBItem $object
 		 * @return bool
 		 */
 		function translationChanged($object)
 		{
 			$translation_fields = $this->getTranslationFields();
 			$changed_fields = array_keys($object->GetChangedFields());
 
 			foreach ($changed_fields as $changed_field) {
 				$changed_field = preg_replace('/^l[\d]+_/', '', $changed_field);
 
 				if ( in_array($changed_field, $translation_fields) ) {
 					return true;
 				}
 			}
 
 			return false;
 		}
 
 		/**
 		 * Returns fields, that can be translated
 		 *
 		 * @return Array
 		 * @access protected
 		 */
 		protected function getTranslationFields()
 		{
 			return Array ('Subject', 'HtmlBody', 'PlainTextBody');
 		}
 
 		/**
 		 * Don't allow to enable/disable events in non-debug mode
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemCreate(kEvent $event)
 		{
 			parent::OnBeforeItemCreate($event);
 
 			$this->_itemChanged($event);
 		}
 
 		/**
 		 * Don't allow to enable/disable events in non-debug mode
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemUpdate(kEvent $event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
 			$this->_itemChanged($event);
 		}
 
 		/**
 		 * Suggest address based on typed address and selected address type
 		 *
 		 * @param kEvent $event
 		 */
 		function OnSuggestAddressJSON($event)
 		{
 			$event->status = kEvent::erSTOP;
 
 			$address_type = $this->Application->GetVar('type');
 			$address = $this->Application->GetVar('term');
 			$limit = $this->Application->GetVar('limit');
 
 			if ( !$limit ) {
 				$limit = 20;
 			}
 
 			switch ($address_type) {
 				case EmailTemplate::ADDRESS_TYPE_EMAIL:
 					$field = 'Email';
 					$table_name = TABLE_PREFIX . 'Users';
 					break;
 
 				case EmailTemplate::ADDRESS_TYPE_USER:
 					$field = 'Username';
 					$table_name = TABLE_PREFIX . 'Users';
 					break;
 
 				case EmailTemplate::ADDRESS_TYPE_GROUP:
 					$field = 'Name';
 					$table_name = TABLE_PREFIX . 'UserGroups';
 					break;
 
 				default:
 					$field = $table_name = '';
 					break;
 			}
 
 			if ( $field ) {
 				$sql = 'SELECT DISTINCT ' . $field . '
 						FROM ' . $table_name . '
 						WHERE ' . $field . ' LIKE ' . $this->Conn->qstr($address . '%') . '
 						ORDER BY ' . $field . ' ASC
 						LIMIT 0,' . $limit;
 				$data = $this->Conn->GetCol($sql);
 			}
 			else {
 				$data = Array ();
 			}
 
 			echo json_encode($data);
 		}
 
 		/**
 		 * Does custom validation
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemValidate(kEvent $event)
 		{
 			parent::OnBeforeItemValidate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			// validate email subject and body for parsing errors
 			$this->_validateEmailTemplate($object);
 
 			// validate sender and recipient addresses
 			if ( $object->GetDBField('CustomSender') ) {
 				$this->_validateAddress($event, 'Sender');
 			}
 
 			$this->_validateAddress($event, 'Recipient');
 			$this->_validateBindEvent($object);
 		}
 
 		/**
 		 * Validates subject and body fields of Email template
 		 *
 		 * @param kDBItem $object
 		 * @return void
 		 * @access protected
 		 */
 		protected function _validateEmailTemplate($object)
 		{
+			/** @var kEmailTemplateHelper $email_template_helper */
 			$email_template_helper = $this->Application->recallObject('kEmailTemplateHelper');
-			/* @var $email_template_helper kEmailTemplateHelper */
 
 			$email_template_helper->parseField($object, 'Subject');
 			$email_template_helper->parseField($object, 'HtmlBody');
 			$email_template_helper->parseField($object, 'PlainTextBody');
 		}
 
 		/**
 		 * Validates address using given field prefix
 		 *
 		 * @param kEvent $event
 		 * @param string $field_prefix
 		 * @return void
 		 * @access protected
 		 */
 		protected function _validateAddress($event, $field_prefix)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$address_type = $object->GetDBField($field_prefix . 'AddressType');
 			$object->setRequired($field_prefix . 'Address', $address_type > 0);
 			$address = $object->GetDBField($field_prefix . 'Address');
 
 			if ( !$address ) {
 				// don't validate against empty address
 				return;
 			}
 
 			switch ($address_type) {
 				case EmailTemplate::ADDRESS_TYPE_EMAIL:
 					if ( !preg_match('/^(' . REGEX_EMAIL_USER . '@' . REGEX_EMAIL_DOMAIN . ')$/i', $address) ) {
 						$object->SetError($field_prefix . 'Address', 'invalid_email');
 					}
 					break;
 
 				case EmailTemplate::ADDRESS_TYPE_USER:
 					$sql = 'SELECT PortalUserId
 							FROM ' . TABLE_PREFIX . 'Users
 							WHERE Username = ' . $this->Conn->qstr($address);
 					if ( !$this->Conn->GetOne($sql) ) {
 						$object->SetError($field_prefix . 'Address', 'invalid_user');
 					}
 					break;
 
 				case EmailTemplate::ADDRESS_TYPE_GROUP:
 					$sql = 'SELECT GroupId
 							FROM ' . TABLE_PREFIX . 'UserGroups
 							WHERE Name = ' . $this->Conn->qstr($address);
 					if ( !$this->Conn->GetOne($sql) ) {
 						$object->SetError($field_prefix . 'Address', 'invalid_group');
 					}
 					break;
 			}
 		}
 
 		/**
 		 * Checks that bind event is specified in correct format and exists
 		 *
 		 * @param kDBItem $object
 		 */
 		protected function _validateBindEvent($object)
 		{
 			$event_string = $object->GetDBField('BindToSystemEvent');
 
 			if ( !$event_string ) {
 				return;
 			}
 
 			try {
 				$this->Application->eventImplemented(new kEvent($event_string));
 			}
 			catch (Exception $e) {
 				$object->SetError('BindToSystemEvent', 'invalid_event', '+' . $e->getMessage());
 			}
 		}
 
 		/**
 		 * Stores ids of selected phrases and redirects to export language step 1
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnExportEmailTemplates(kEvent $event)
 		{
 			if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
 				$event->status = kEvent::erFAIL;
 				return;
 			}
 
 			$this->Application->getUnitConfig('phrases')->setAutoLoad(false);
 
 			$this->StoreSelectedIDs($event);
 			$this->Application->StoreVar('export_language_ids', $this->Application->GetVar('m_lang'));
 
 			$event->setRedirectParams(
 				Array (
 					'phrases.export_event' => 'OnNew',
 					'pass' => 'all,phrases.export',
 					'export_mode' => $event->Prefix,
 				)
 			);
 		}
 
 		/**
 		 * Deletes all subscribers to e-mail event after it was deleted
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemDelete(kEvent $event)
 		{
 			parent::OnAfterItemDelete($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$sql = 'SELECT SubscriptionId
 					FROM ' . TABLE_PREFIX . 'SystemEventSubscriptions
 					WHERE EmailTemplateId = ' . $object->GetID();
 			$ids = $this->Conn->GetCol($sql);
 
 			if ( !$ids ) {
 				return;
 			}
 
+			/** @var kTempTablesHandler $temp_handler */
 			$temp_handler = $this->Application->recallObject('system-event-subscription_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event->MasterEvent));
-			/* @var $temp_handler kTempTablesHandler */
 
 			$temp_handler->DeleteItems('system-event-subscription', '', $ids);
 		}
 
 		/**
 		 * Sends selected e-mail event
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnSend(kEvent $event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject(Array ('skip_autoload' => true));
-			/* @var $object kDBItem */
 
 			$ids = $this->StoreSelectedIDs($event);
 
 			foreach ($ids as $id) {
 				$object->Load($id);
 
 				if ( $object->GetDBField('Type') == EmailTemplate::TEMPLATE_TYPE_ADMIN ) {
 					$this->Application->emailAdmin($object->GetDBField('TemplateName'));
 				}
 				else {
 					$this->Application->emailUser($object->GetDBField('TemplateName'));
 				}
 			}
 
 			$this->clearSelectedIDs($event);
 		}
 
 		/**
 		 * Updates translation state for all saved phrases
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeCopyToLive(kEvent $event)
 		{
 			parent::OnBeforeCopyToLive($event);
 
 			$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
 			/* @var $ml_helper kMultiLanguageHelper */
 
 			$ml_helper->updateTranslationState($event);
 		}
 
 	}
Index: branches/5.3.x/core/units/email_templates/email_template_tp.php
===================================================================
--- branches/5.3.x/core/units/email_templates/email_template_tp.php	(revision 16518)
+++ branches/5.3.x/core/units/email_templates/email_template_tp.php	(revision 16519)
@@ -1,142 +1,142 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2010 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class EmailTemplateTagProcessor extends kDBTagProcessor
 	{
 		/**
 		 * Removes "Enabled" column, when not in debug mode
 		 *
 		 * @param Array $params
 		 */
 		function ModifyUnitConfig($params)
 		{
 			if ( !$this->Application->isDebugMode() ) {
 				$config = $this->getUnitConfig();
 				$grids = $config->getGrids(Array ());
 
 				foreach ($grids as $grid_name => $grid_data) {
 					if ( array_key_exists('Enabled', $grid_data['Fields']) ) {
 						unset($grids[$grid_name]['Fields']['Enabled']);
 					}
 				}
 
 				$config->setGrids($grids);
 			}
 		}
 
 		/**
 		 * Checks, that field can be edited
 		 *
 		 * @param Array $params
 		 * @return string
 		 */
 		function IsEditable($params)
 		{
 			if ($this->Application->isDebugMode()) {
 				return true;
 			}
 
+			/** @var kDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBItem */
 
 			return $object->GetDBField($params['check_field']);
 		}
 
 		/**
 		 * To recipient read-only
 		 *
 		 * @param Array $params
 		 * @return string
 		 * @access protected
 		 */
 		protected function ToRecipientReadOnly($params)
 		{
 			return !$this->IsEditable(Array ('check_field' => 'AllowChangingRecipient'));
 		}
 
 		/**
 		 * Removes "To" options from possible options in "RecipientType" field
 		 *
 		 * @param Array $params
 		 */
 		function RemoveToRecipientType($params)
 		{
+			/** @var kDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBItem */
 
 			$field_options = $object->GetFieldOptions('RecipientType');
 			unset($field_options['options'][ EmailTemplate::RECIPIENT_TYPE_TO ]);
 			$object->SetFieldOptions('RecipientType', $field_options);
 		}
 
 		/**
 		 * Restores "To" option in possible option list in "RecipientType" field
 		 *
 		 * @param Array $params
 		 */
 		function RestoreRecipientType($params)
 		{
+			/** @var kDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBItem */
 
 			$field_options = $object->GetFieldOptions('RecipientType');
 			$virtual_field_options = $this->getUnitConfig()->getVirtualFieldByName('RecipientType');
 
 			$field_options['options'] = $virtual_field_options['options'];
 			$object->SetFieldOptions('RecipientType', $field_options);
 		}
 
 		/**
 		 * Determine if primary translation should be shown
 		 *
 		 * @param Array $params
 		 * @return string
 		 * @access protected
 		 */
 		protected function ShowSourceLanguage($params)
 		{
 			if ( $this->IsNewItem($params) ) {
 				return false;
 			}
 
 			$object = $this->getObject($params);
 			/* @var $object kDBItem */
 
 			$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
 			/* @var $ml_helper kMultiLanguageHelper */
 
 			return !$ml_helper->editingInSourceLanguage($object->GetDBField('TranslateFromLanguage'));
 		}
 
 		/**
 		 * Shows field label with %s replaced with source translation language
 		 *
 		 * @param Array $params
 		 * @return string
 		 * @access protected
 		 */
 		protected function SourceLanguageTitle($params)
 		{
 			$object = $this->getObject($params);
 			/* @var $object kDBItem */
 
 			$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
 			/* @var $ml_helper kMultiLanguageHelper */
 
 			return $ml_helper->replaceSourceLanguage($object, $params['label']);
 		}
 
 	}
Index: branches/5.3.x/core/units/languages/languages_tag_processor.php
===================================================================
--- branches/5.3.x/core/units/languages/languages_tag_processor.php	(revision 16518)
+++ branches/5.3.x/core/units/languages/languages_tag_processor.php	(revision 16519)
@@ -1,133 +1,133 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class LanguagesTagProcessor extends kDBTagProcessor
 	{
 		/**
 		 * Sets content-type of page
 		 *
 		 * @param Array $params
 		 * @return string
 		 * @access protected
 		 */
 		protected function SetContentType($params)
 		{
 			$content_type = isset($params['content_type']) ? $params['content_type'] : 'text/html';
 			$include_charset = isset($params['include_charset']) ? $params['include_charset'] : null;
 
 			$this->Application->setContentType($content_type, $include_charset);
 
 			return '';
 		}
 
 		/**
 		 * Returns formatted date + time on current language
 		 *
 		 * @param Array $params
 		 * @return string
 		 */
 		function CurrentDate($params)
 		{
 			$format = $params['format'];
 			$date = time();
 
 			if (strpos($format, 'l') !== false) {
 				$week_day = $this->Application->Phrase('lu_weekday_' . date('l'));
 				$format = str_replace('l', '#@#', $format); // replace with reserved char (preserves translation link)
 
 				return str_replace('#@#', $week_day, date($format, $date));
 			}
 
 			return date($format, $date);
 		}
 
 		function ListLanguages($params)
 		{
 			$this->Init($this->Prefix, 'enabled');
 
 			return $this->PrintList2($params);
 		}
 
 		function LanguageName($params)
 		{
 			$object = $this->getObject($params);
 			return $this->Application->Phrase($params['phrase_prefix'].$object->GetDBField('PackName'));
 		}
 
 		function LanguageLink($params)
 		{
 			$object = $this->getObject($params);
 
 			$params['m_lang'] = $object->GetID();
 
 			return $this->Application->ProcessParsedTag('m', 'Link', $params);
 		}
 
 		function SelectedLanguage($params)
 		{
+			/** @var kDBList $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBList */
 
 			if (array_key_exists('type', $params) && $params['type'] == 'data') {
 				// when using language selector on editing forms
 				return $object->GetDBField('LanguageId') == $this->Application->GetVar('m_lang');
 			}
 
 			return $object->GetDBField('LanguageId') == $this->Application->Phrases->LanguageId;
 		}
 
 		/**
 		 * Returns path where exported languages should be saved
 		 *
 		 * @param Array $params
 		 * @return string
 		 * @access protected
 		 */
 		protected function ExportPath($params)
 		{
 			$ret = EXPORT_PATH . '/';
 
 			if ( getArrayValue($params, 'as_url') ) {
 				$ret = str_replace(FULL_PATH . '/', $this->Application->BaseURL(), $ret);
 			}
 
 			return $ret;
 		}
 
 		/**
 		 * Returns true if system has more then 1 language installed
 		 *
 		 * @param Array $params
 		 * @return bool
 		 */
 		function IsMultiLanguage($params)
 		{
 			return $this->TotalRecords($params) > 1;
 		}
 
 		function IsPrimaryLanguage($params)
 		{
 			return $this->Application->GetDefaultLanguageId() == $this->Application->GetVar('m_lang');
 		}
 
 /*		function Main_IsMetricUnits($params)
 		{
 			$object = $this->Application->recallObject($this->Prefix.'.current');
 			$measure_system = $object->GetDBField('UnitSystem');
 			return $measure_system == 1 ? 1 : 0;
 		}*/
 
 	}
\ No newline at end of file
Index: branches/5.3.x/core/units/languages/languages_event_handler.php
===================================================================
--- branches/5.3.x/core/units/languages/languages_event_handler.php	(revision 16518)
+++ branches/5.3.x/core/units/languages/languages_event_handler.php	(revision 16519)
@@ -1,828 +1,830 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class LanguagesEventHandler extends kDBEventHandler
 	{
 		/**
 		 * Allows to override standard permission mapping
 		 *
 		 * @return void
 		 * @access protected
 		 * @see kEventHandler::$permMapping
 		 */
 		protected function mapPermissions()
 		{
 			parent::mapPermissions();
 
 			$permissions = Array (
 				'OnChangeLanguage' => Array ('self' => true),
 				'OnSetPrimary' => Array ('self' => 'advanced:set_primary|add|edit'),
 				'OnImportLanguage' => Array ('self' => 'advanced:import'),
 				'OnExportLanguage' => Array ('self' => 'advanced:export'),
 				'OnExportProgress' => Array ('self' => 'advanced:export'),
 				'OnReflectMultiLingualFields' => Array ('self' => 'view'),
 				'OnSynchronizeLanguages' => Array ('self' => 'edit'),
 			);
 
 			$this->permMapping = array_merge($this->permMapping, $permissions);
 		}
 
 		/**
 		 * Checks user permission to execute given $event
 		 *
 		 * @param kEvent $event
 		 * @return bool
 		 * @access public
 		 */
 		public function CheckPermission(kEvent $event)
 		{
 			if ( $event->Name == 'OnItemBuild' ) {
 				// check permission without using $event->getSection(),
 				// so first cache rebuild won't lead to "ldefault_Name" field being used
 				return true;
 			}
 
 			return parent::CheckPermission($event);
 		}
 
 		/**
 		 * Ensure, that current object is always taken from live table.
 		 *
 		 * @param kDBBase|kDBItem|kDBList $object Object.
 		 * @param kEvent                  $event  Event.
 		 *
 		 * @return void
 		 */
 		protected function dbBuild(&$object, kEvent $event)
 		{
 			if ( $event->Special == 'current' ) {
 				$event->setEventParam('live_table', true);
 			}
 
 			parent::dbBuild($object, $event);
 		}
 
 		/**
 		 * Allows to get primary language object
 		 *
 		 * @param kEvent $event
 		 * @return int
 		 * @access public
 		 */
 		public function getPassedID(kEvent $event)
 		{
 			if ( $event->Special == 'primary' ) {
 				return $this->Application->GetDefaultLanguageId();
 			}
 			elseif ( $event->Special == 'current' ) {
 				$language_id = $this->Application->GetVar('m_lang');
 
 				if ( !$language_id ) {
 					$language_id = 'default';
 				}
 				else {
 					$event->setEventParam(kEvent::FLAG_ID_FROM_REQUEST, true);
 				}
 
 				$this->Application->SetVar('m_lang', $language_id);
 				$this->Application->SetVar($event->getPrefixSpecial() . '_id', $language_id);
 
 				return $language_id;
 			}
 
 			return parent::getPassedID($event);
 		}
 
 		/**
 		 * [HOOK] Updates table structure on new language adding/removing language
 		 *
 		 * @param kEvent $event
 		 */
 		function OnReflectMultiLingualFields($event)
 		{
 			if ($this->Application->GetVar('ajax') == 'yes') {
 				$event->status = kEvent::erSTOP;
 			}
 
 			if (is_object($event->MasterEvent)) {
 				if ($event->MasterEvent->status != kEvent::erSUCCESS) {
 					// only rebuild when all fields are validated
 					return ;
 				}
 
 				if (($event->MasterEvent->Name == 'OnSave') && !$this->Application->GetVar('new_language')) {
 					// only rebuild during new language adding
 					return ;
 				}
 			}
 
+			/** @var kMultiLanguageHelper $ml_helper */
 			$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
-			/* @var $ml_helper kMultiLanguageHelper */
 
 			$ml_helper->massCreateFields();
 			$event->SetRedirectParam('action_completed', 1);
 		}
 
 		/**
 		 * Allows to set selected language as primary
 		 *
 		 * @param kEvent $event
 		 */
 		function OnSetPrimary($event)
 		{
 			if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
 				$event->status = kEvent::erFAIL;
 				return;
 			}
 
 			$this->StoreSelectedIDs($event);
 			$ids = $this->getSelectedIDs($event);
 			if ($ids) {
 				$id = array_shift($ids);
+
+				/** @var LanguagesItem $object */
 				$object = $event->getObject( Array('skip_autoload' => true) );
-				/* @var $object LanguagesItem */
 
 				$object->Load($id);
 				$object->copyMissingData( $object->setPrimary() );
 			}
 		}
 
 		/**
 		 * [HOOK] Reset primary status of other languages if we are saving primary language
 		 *
 		 * @param kEvent $event
 		 */
 		function OnUpdatePrimary($event)
 		{
 			if ($event->MasterEvent->status != kEvent::erSUCCESS) {
 				return ;
 			}
 
+			/** @var LanguagesItem $object */
 			$object = $event->getObject( Array('skip_autoload' => true) );
-			/* @var $object LanguagesItem */
 
 			$object->SwitchToLive();
 
 			// set primary for each languages, that have this checkbox checked
 			$ids = explode(',', $event->MasterEvent->getEventParam('ids'));
 			foreach ($ids as $id) {
 				$object->Load($id);
 				if ($object->GetDBField('PrimaryLang')) {
 					$object->copyMissingData( $object->setPrimary(true, false) );
 				}
 
 				if ($object->GetDBField('AdminInterfaceLang')) {
 					$object->setPrimary(true, true);
 				}
 			}
 
 			// if no primary language left, then set primary last language (not to load again) from edited list
 			$sql = 'SELECT '.$object->IDField.'
 					FROM '.$object->TableName.'
 					WHERE PrimaryLang = 1';
 			$primary_language = $this->Conn->GetOne($sql);
 
 			if (!$primary_language) {
 				$object->setPrimary(false, false); // set primary language
 			}
 
 			$sql = 'SELECT '.$object->IDField.'
 					FROM '.$object->TableName.'
 					WHERE AdminInterfaceLang = 1';
 			$primary_language = $this->Conn->GetOne($sql);
 
 			if (!$primary_language) {
 				$object->setPrimary(false, true); // set admin interface language
 			}
 		}
 
 		/**
 		 * Prefills options with dynamic values
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterConfigRead(kEvent $event)
 		{
 			parent::OnAfterConfigRead($event);
 
 			$this->_evaluateFieldFormats($event, 'InputDateFormat');
 			$this->_evaluateFieldFormats($event, 'InputTimeFormat');
 		}
 
 		/**
 		 * Set dynamic hints for options in date format fields
 		 *
 		 * @param kEvent $event
 		 * @param string $field
 		 * @return void
 		 * @access protected
 		 */
 		protected function _evaluateFieldFormats(kEvent $event, $field)
 		{
 			$config = $event->getUnitConfig();
 			$field_options = $config->getFieldByName($field);
 
 			foreach ($field_options['options'] as $option_key => $option_title) {
 				$field_options['options'][$option_key] .= ' (' . date($option_key) . ')';
 			}
 
 			$config->addFields($field_options, $field);
 		}
 
 		/**
 		 * Occurs before creating item
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemCreate(kEvent $event)
 		{
 			parent::OnBeforeItemCreate($event);
 
 			$this->_itemChanged($event);
 		}
 
 		/**
 		 * Occurs before updating item
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemUpdate(kEvent $event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$status_field = $event->getUnitConfig()->getStatusField(true);
 
 			if ( $object->GetDBField('PrimaryLang') == 1 && $object->GetDBField($status_field) == 0 ) {
 				$object->SetDBField($status_field, 1);
 			}
 
 			$this->_itemChanged($event);
 		}
 
 
 		/**
 		 * Dynamically changes required fields
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function _itemChanged(kEvent $event)
 		{
 			$this->setRequired($event);
 		}
 
 		/**
 		 * Dynamically changes required fields
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemValidate(kEvent $event)
 		{
 			parent::OnBeforeItemValidate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
+			/** @var kEmailTemplateHelper $email_template_helper */
 			$email_template_helper = $this->Application->recallObject('kEmailTemplateHelper');
-			/* @var $email_template_helper kEmailTemplateHelper */
 
 			$email_template_helper->parseField($object, 'HtmlEmailTemplate');
 			$email_template_helper->parseField($object, 'TextEmailTemplate');
 
 			$check_field = $object->GetDBField('TextEmailTemplate') ? 'TextEmailTemplate' : 'HtmlEmailTemplate';
 			$check_value = $object->GetDBField($check_field);
 
 			if ( $check_value && strpos($check_value, '$body') === false ) {
 				$object->SetError($check_field, 'body_missing');
 			}
 		}
 
 		/**
 		 * Dynamically changes required fields
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function setRequired(kEvent $event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$object->setRequired('HtmlEmailTemplate', !$object->GetDBField('TextEmailTemplate'));
 			$object->setRequired('TextEmailTemplate', !$object->GetDBField('HtmlEmailTemplate'));
 		}
 
 		/**
 		 * Shows only enabled languages on front
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
 		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			if ( in_array($event->Special, Array ('enabled', 'selected', 'available')) ) {
 				$object->addFilter('enabled_filter', '%1$s.Enabled = ' . STATUS_ACTIVE);
 			}
 
 			// site domain language picker
 			if ( $event->Special == 'selected' || $event->Special == 'available' ) {
+				/** @var EditPickerHelper $edit_picker_helper */
 				$edit_picker_helper = $this->Application->recallObject('EditPickerHelper');
-				/* @var $edit_picker_helper EditPickerHelper */
 
 				$edit_picker_helper->applyFilter($event, 'Languages');
 			}
 
 			// apply domain-based language filtering
 			$languages = $this->Application->siteDomainField('Languages');
 
 			if ( strlen($languages) ) {
 				$languages = explode('|', substr($languages, 1, -1));
 				$object->addFilter('domain_filter', '%1$s.LanguageId IN (' . implode(',', $languages) . ')');
 			}
 		}
 
 		/**
 		 * Copy labels from another language
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemCreate(kEvent $event)
 		{
 			parent::OnAfterItemCreate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$src_language = $object->GetDBField('CopyFromLanguage');
 
 			if ( $object->GetDBField('CopyLabels') && $src_language ) {
 				$dst_language = $object->GetID();
 
 				// 1. schedule data copy after OnSave event is executed
 				$var_name = $event->getPrefixSpecial() . '_copy_data' . $this->Application->GetVar('m_wid');
 				$pending_actions = $this->Application->RecallVar($var_name, Array ());
 
 				if ( $pending_actions ) {
 					$pending_actions = unserialize($pending_actions);
 				}
 
 				$pending_actions[$src_language] = $dst_language;
 				$this->Application->StoreVar($var_name, serialize($pending_actions));
 				$object->SetDBField('CopyLabels', 0);
 			}
 		}
 
 		/**
 		 * Saves language from temp table to live
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnSave(kEvent $event)
 		{
 			parent::OnSave($event);
 
 			if ( $event->status != kEvent::erSUCCESS ) {
 				return;
 			}
 
 			$var_name = $event->getPrefixSpecial() . '_copy_data' . $this->Application->GetVar('m_wid');
 			$pending_actions = $this->Application->RecallVar($var_name, Array ());
 
 			if ( $pending_actions ) {
 				$pending_actions = unserialize($pending_actions);
 			}
 
 			// create multilingual columns for phrases & email events table first (actual for 6+ language)
+			/** @var kMultiLanguageHelper $ml_helper */
 			$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
-			/* @var $ml_helper kMultiLanguageHelper */
 
 			$ml_helper->createFields('phrases');
 			$ml_helper->createFields('email-template');
 
 			foreach ($pending_actions as $src_language => $dst_language) {
 				// phrases import
 				$sql = 'UPDATE ' . $this->Application->getUnitConfig('phrases')->getTableName() . '
 						SET l' . $dst_language . '_Translation = l' . $src_language . '_Translation';
 				$this->Conn->Query($sql);
 
 				// events import
 				$sql = 'UPDATE ' . $this->Application->getUnitConfig('email-template')->getTableName() . '
 						SET
 							l' . $dst_language . '_Subject = l' . $src_language . '_Subject,
 							l' . $dst_language . '_HtmlBody = l' . $src_language . '_HtmlBody,
 							l' . $dst_language . '_PlainTextBody = l' . $src_language . '_PlainTextBody';
 				$this->Conn->Query($sql);
 			}
 
 			$this->Application->RemoveVar($var_name);
 
 			$event->CallSubEvent('OnReflectMultiLingualFields');
 			$event->CallSubEvent('OnUpdatePrimary');
 		}
 
 		/**
 		 * Prepare temp tables for creating new item
 		 * but does not create it. Actual create is
 		 * done in OnPreSaveCreated
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnPreCreate(kEvent $event)
 		{
 			parent::OnPreCreate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$object->SetDBField('CopyLabels', 1);
 
 			$sql = 'SELECT ' . $object->IDField . '
 					FROM ' . $event->getUnitConfig()->getTableName() . '
 					WHERE PrimaryLang = 1';
 			$primary_lang_id = $this->Conn->GetOne($sql);
 
 			$object->SetDBField('CopyFromLanguage', $primary_lang_id);
 			$object->SetDBField('SynchronizationModes', Language::SYNCHRONIZE_DEFAULT);
 
 			$this->setRequired($event);
 		}
 
 		/**
 		 * Sets dynamic required fields
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemLoad(kEvent $event)
 		{
 			parent::OnAfterItemLoad($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$this->setRequired($event);
 		}
 		/**
 		 * Sets new language mark
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeDeleteFromLive(kEvent $event)
 		{
 			parent::OnBeforeDeleteFromLive($event);
 
 			$config = $event->getUnitConfig();
 			$id_field = $config->getIDField();
 
 			$sql = 'SELECT ' . $id_field . '
 					FROM ' . $config->getTableName() . '
 					WHERE ' . $id_field . ' = ' . $event->getEventParam('id');
 			$id = $this->Conn->GetOne($sql);
 
 			if ( !$id ) {
 				$this->Application->SetVar('new_language', 1);
 			}
 		}
 
 		function OnChangeLanguage($event)
 		{
 			$language_id = $this->Application->GetVar('language');
 			$language_field = $this->Application->isAdmin ? 'AdminLanguage' : 'FrontLanguage';
 
 			$this->Application->SetVar('m_lang', $language_id);
 
 			// set new language for this session
 			$this->Application->Session->SetField('Language', $language_id);
 
 			// remember last user language
 			if ($this->Application->RecallVar('user_id') == USER_ROOT) {
 				$this->Application->StorePersistentVar($language_field, $language_id);
 			}
 			else {
+				/** @var kDBItem $object */
 				$object = $this->Application->recallObject('u.current');
-				/* @var $object kDBItem */
 
 				$object->SetDBField($language_field, $language_id);
 				$object->Update();
 			}
 
 			// without this language change in admin will cause erase of last remembered tree section
 			$this->Application->SetVar('skip_last_template', 1);
 		}
 
 		/**
 		 * Parse language XML file into temp tables and redirect to progress bar screen
 		 *
 		 * @param kEvent $event
 		 */
 		function OnImportLanguage($event)
 		{
 			if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
 				$event->status = kEvent::erFAIL;
 				return;
 			}
 
 			$items_info = $this->Application->GetVar('phrases_import');
 			if ($items_info) {
 				list ($id, $field_values) = each($items_info);
 
+				/** @var kDBItem $object */
 				$object = $this->Application->recallObject('phrases.import', 'phrases', Array('skip_autoload' => true));
-				/* @var $object kDBItem */
 
 				$object->setID($id);
 				$object->SetFieldsFromHash($field_values);
 				$event->setEventParam('form_data', $field_values);
 
 				if (!$object->Validate()) {
 					$event->status = kEvent::erFAIL;
 					return ;
 				}
 
 				$filename = $object->GetField('LangFile', 'full_path');
 
 				if (!filesize($filename)) {
 					$object->SetError('LangFile', 'la_empty_file', 'la_EmptyFile');
 					$event->status = kEvent::erFAIL;
 				}
 
+				/** @var LanguageImportHelper $language_import_helper */
 				$language_import_helper = $this->Application->recallObject('LanguageImportHelper');
-				/* @var $language_import_helper LanguageImportHelper */
 
 				if ( $object->GetDBField('ImportOverwrite') ) {
 					$language_import_helper->setOption(LanguageImportHelper::OVERWRITE_EXISTING);
 				}
 
 				if ( $object->GetDBField('ImportSynced') ) {
 					$language_import_helper->setOption(LanguageImportHelper::SYNC_ADDED);
 				}
 
 				$language_import_helper->performImport($filename, $object->GetDBField('PhraseType'), $object->GetDBField('Module'));
 
 				// delete uploaded language pack after import is finished
 				unlink($filename);
 
 				$event->SetRedirectParam('opener', 'u');
 			}
 		}
 
 		/**
 		 * Stores ids of selected languages and redirects to export language step 1
 		 *
 		 * @param kEvent $event
 		 */
 		function OnExportLanguage($event)
 		{
 			if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
 				$event->status = kEvent::erFAIL;
 				return;
 			}
 
 			$this->Application->getUnitConfig('phrases')->setAutoLoad(false);
 
 			$this->StoreSelectedIDs($event);
 			$this->Application->StoreVar('export_language_ids', implode(',', $this->getSelectedIDs($event)));
 
 			$event->setRedirectParams(
 				Array (
 					'phrases.export_event' => 'OnNew',
 					'pass' => 'all,phrases.export',
 					'export_mode' => $event->Prefix,
 				)
 			);
 		}
 
 		/**
 		 * Saves selected languages to xml file passed
 		 *
 		 * @param kEvent $event
 		 */
 		function OnExportProgress($event)
 		{
 			$items_info = $this->Application->GetVar('phrases_export');
 			if ( $items_info ) {
 				list($id, $field_values) = each($items_info);
+
+				/** @var kDBItem $object */
 				$object = $this->Application->recallObject('phrases.export', null, Array ('skip_autoload' => true));
-				/* @var $object kDBItem */
 
 				$object->setID($id);
 				$object->SetFieldsFromHash($field_values);
 				$event->setEventParam('form_data', $field_values);
 
 				if ( !$object->Validate() ) {
 					$event->status = kEvent::erFAIL;
 					return;
 				}
 
+				/** @var FileHelper $file_helper */
 				$file_helper = $this->Application->recallObject('FileHelper');
-				/* @var $file_helper FileHelper */
 
 				$file_helper->CheckFolder(EXPORT_PATH);
 
 				if ( !is_writable(EXPORT_PATH) ) {
 					$event->status = kEvent::erFAIL;
 					$object->SetError('LangFile', 'write_error', 'la_ExportFolderNotWritable');
 
 					return;
 				}
 
 				if ( substr($field_values['LangFile'], -5) != '.lang' ) {
 					$field_values['LangFile'] .= '.lang';
 				}
 
 				$filename = EXPORT_PATH . '/' . $field_values['LangFile'];
 
+				/** @var LanguageImportHelper $language_import_helper */
 				$language_import_helper = $this->Application->recallObject('LanguageImportHelper');
-				/* @var $language_import_helper LanguageImportHelper */
 
 				if ( $object->GetDBField('DoNotEncode') ) {
 					$language_import_helper->setExportEncoding('plain');
 				}
 
 				$data_types = Array (
 					'phrases' => 'ExportPhrases',
 					'email-template' => 'ExportEmailTemplates',
 					'country-state' => 'ExportCountries'
 				);
 
 				$export_mode = $this->Application->GetVar('export_mode');
 				$allowed_data_types = explode('|', substr($field_values['ExportDataTypes'], 1, -1));
 
 				if ( $export_mode == $event->Prefix ) {
 					foreach ($data_types as $prefix => $export_limit_field) {
 						$export_limit = in_array($prefix, $allowed_data_types) ? $field_values[$export_limit_field] : '-';
 						$language_import_helper->setExportLimit($prefix, $export_limit);
 					}
 				}
 				else {
 					foreach ($data_types as $prefix => $export_limit_field) {
 						$export_limit = in_array($prefix, $allowed_data_types) ? null : '-';
 						$language_import_helper->setExportLimit($prefix, $export_limit);
 					}
 				}
 
 				$lang_ids = explode(',', $this->Application->RecallVar('export_language_ids'));
 				$language_import_helper->performExport($filename, $field_values['PhraseType'], $lang_ids, $field_values['Module']);
 			}
 
 			$event->redirect = 'regional/languages_export_step2';
 			$event->SetRedirectParam('export_file', $field_values['LangFile']);
 		}
 
 		/**
 		 * Returns to previous template in opener stack
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnGoBack(kEvent $event)
 		{
 			$event->SetRedirectParam('opener', 'u');
 		}
 
 		function OnScheduleTopFrameReload($event)
 		{
 			$this->Application->StoreVar('RefreshTopFrame',1);
 		}
 
 		/**
 		 * Do now allow deleting current language
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemDelete(kEvent $event)
 		{
 			parent::OnBeforeItemDelete($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			if ( $object->GetDBField('PrimaryLang') || $object->GetDBField('AdminInterfaceLang') || $object->GetID() == $this->Application->GetVar('m_lang') ) {
 				$event->status = kEvent::erFAIL;
 			}
 		}
 
 		/**
 		 * Deletes phrases and email events on given language
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemDelete(kEvent $event)
 		{
 			parent::OnAfterItemDelete($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			// clean EmailTemplates table
 			$fields_hash = Array (
 				'l' . $object->GetID() . '_Subject' => NULL,
 				'l' . $object->GetID() . '_HtmlBody' => NULL,
 				'l' . $object->GetID() . '_PlainTextBody' => NULL,
 			);
 			$this->Conn->doUpdate($fields_hash, $this->Application->getUnitConfig('email-template')->getTableName(), 1);
 
 			// clean Phrases table
 			$fields_hash = Array (
 				'l' . $object->GetID() . '_Translation' => NULL,
 				'l' . $object->GetID() . '_HintTranslation' => NULL,
 				'l' . $object->GetID() . '_ColumnTranslation' => NULL,
 			);
 			$this->Conn->doUpdate($fields_hash, $this->Application->getUnitConfig('phrases')->getTableName(), 1);
 		}
 
 		/**
 		 * Copy missing phrases across all system languages (starting from primary)
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnSynchronizeLanguages($event)
 		{
 			if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
 				$event->status = kEvent::erFAIL;
 				return;
 			}
 
 			$source_languages = $target_languages = Array ();
 
 			// get language list with primary language first
 			$sql = 'SELECT SynchronizationModes, LanguageId
 					FROM ' . TABLE_PREFIX . 'Languages
 					WHERE SynchronizationModes <> ""
 					ORDER BY PrimaryLang DESC';
 			$languages = $this->Conn->GetCol($sql, 'LanguageId');
 
 			foreach ($languages as $language_id => $synchronization_modes) {
 				$synchronization_modes = explode('|', substr($synchronization_modes, 1, -1));
 
 				if ( in_array(Language::SYNCHRONIZE_TO_OTHERS, $synchronization_modes) ) {
 					$source_languages[] = $language_id;
 				}
 
 				if ( in_array(Language::SYNCHRONIZE_FROM_OTHERS, $synchronization_modes) ) {
 					$target_languages[] = $language_id;
 				}
 			}
 
 			foreach ($source_languages as $source_id) {
 				foreach ($target_languages as $target_id) {
 					if ( $source_id == $target_id ) {
 						continue;
 					}
 
 					$sql = 'UPDATE ' . TABLE_PREFIX . 'LanguageLabels
 							SET l' . $target_id . '_Translation = l' . $source_id . '_Translation
 							WHERE COALESCE(l' . $target_id . '_Translation, "") = "" AND COALESCE(l' . $source_id . '_Translation, "") <> ""';
 					$this->Conn->Query($sql);
 				}
 			}
 		}
 	}
Index: branches/5.3.x/core/units/languages/languages_item.php
===================================================================
--- branches/5.3.x/core/units/languages/languages_item.php	(revision 16518)
+++ branches/5.3.x/core/units/languages/languages_item.php	(revision 16519)
@@ -1,304 +1,304 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class LanguagesItem extends kDBItem
 	{
 		function generateID()
 		{
 			$sql = 'SELECT MAX(' . $this->IDField . ')
 					FROM ' . $this->getUnitConfig()->getTableName();
 
 			return $this->Conn->GetOne($sql) + 1;
 		}
 
 		/**
 		 * Set's current language as new primary and return previous primary language
 		 *
 		 * @param bool $reset_primary
 		 * @param bool $admin_language
 		 * @return int
 		 */
 		function setPrimary($reset_primary = true, $admin_language = false)
 		{
 			$prev_primary = false;
 			$primary_field = $admin_language ? 'AdminInterfaceLang' : 'PrimaryLang';
 
 			if ($reset_primary) {
 				$sql = 'SELECT ' . $this->IDField . '
 						FROM ' . $this->TableName . '
 						WHERE ' . $primary_field . ' = 1';
 				$prev_primary = $this->Conn->GetOne($sql);
 
 				$sql = 'UPDATE '.$this->TableName.'
 						SET '.$primary_field.' = 0';
 				$this->Conn->Query($sql);
 			}
 
 			$sql = 'UPDATE '.$this->TableName.'
 					SET '.$primary_field.' = 1, Enabled = 1
 					WHERE '.$this->IDField.' = '.$this->GetID();
 			$this->Conn->Query($sql);
 
 			// in case, when Update method is called for this langauge object
 			$this->SetDBField($primary_field, 1);
 			$this->SetDBField('Enabled', 1);
 
 			// increment serial by hand, since no Update method is called
 			$this->Application->incrementCacheSerial($this->Prefix);
 			$this->Application->incrementCacheSerial($this->Prefix, $this->GetID());
 
 			return $prev_primary;
 		}
 
 		/**
 		 * Copies missing data on current language from given language
 		 *
 		 * @param int $from_language
 		 */
 		function copyMissingData($from_language)
 		{
 			if ( !is_numeric($from_language) || ($from_language == $this->GetID()) ) {
 				// invalid or same language
 				return ;
 			}
 
+			/** @var kMultiLanguageHelper $ml_helper */
 			$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
-			/* @var $ml_helper kMultiLanguageHelper */
 
 			$to_language = $this->GetID();
 			$this->Application->UnitConfigReader->ReReadConfigs();
 
 			foreach ($this->Application->UnitConfigReader->getPrefixes() as $prefix) {
 				$ml_helper->copyMissingData($prefix, $from_language, $to_language);
 			}
 		}
 
 		/**
 		 * Allows to format number according to regional settings
 		 *
 		 * @param float $number
 		 * @param int $precision
 		 * @return float
 		 */
 		function formatNumber($number, $precision = null)
 		{
 			if (is_null($precision)) {
 				$precision = preg_match('/[\.,]+/', $number) ? strlen(preg_replace('/^.*[\.,]+/', '', $number)) : 0;
 			}
 			return number_format($number, $precision, (string)$this->GetDBField('DecimalPoint'), (string)$this->GetDBField('ThousandSep'));
 		}
 
 		/**
 		 * Returns language id based on HTTP header "Accept-Language"
 		 *
 		 * @return int
 		 */
 		function processAcceptLanguage()
 		{
 			if (!array_key_exists('HTTP_ACCEPT_LANGUAGE', $_SERVER) || !$_SERVER['HTTP_ACCEPT_LANGUAGE']) {
 				return false;
 			}
 
 			$accepted_languages = Array ();
 			$language_string = explode(',', strtolower($_SERVER['HTTP_ACCEPT_LANGUAGE']));
 
 			foreach ($language_string as $mixed_language) {
 				if (strpos($mixed_language, ';') !== false) {
 					list ($language_locale, $language_quality) = explode(';', $mixed_language);
 					$language_quality = (float)substr($language_quality, 2); // format "q=4.45"
 				}
 				else {
 					$language_locale = $mixed_language;
 					$language_quality = 1.00;
 				}
 
 				$accepted_languages[ trim($language_locale) ] = trim($language_quality);
 			}
 
 			arsort($accepted_languages, SORT_NUMERIC);
 
 			foreach ($accepted_languages as $language_locale => $language_quality) {
 				$language_id = $this->getAvailableLanguage($language_locale);
 
 				if ($language_id) {
 					return $language_id;
 				}
 			}
 
 			return false;
 		}
 
 		/**
 		 * Returns language ID based on given locale
 		 *
 		 * @param string $locale
 		 * @return int
 		 */
 		function getAvailableLanguage($locale)
 		{
 			$cache_key = 'available_languages[%LangSerial%]';
 			$available_languages = $this->Application->getCache($cache_key);
 
 			if ($available_languages === false) {
 				$this->Conn->nextQueryCachable = true;
 				$sql = 'SELECT LanguageId, LOWER(Locale) AS Locale
 						FROM ' . TABLE_PREFIX . 'Languages
 						WHERE Enabled = 1';
 				$available_languages = $this->Conn->GetCol($sql, 'Locale');
 				$this->Application->setCache($cache_key, $available_languages);
 			}
 
 			if (strpos($locale, '-') !== false) {
 				// exact language match requested
 				$language_id = array_key_exists($locale, $available_languages) ? $available_languages[$locale] : false;
 
 				if ($language_id && $this->siteDomainLanguageEnabled($language_id)) {
 					return $language_id;
 				}
 
 				return false;
 			}
 
 			// partial (like "en" matches "en-GB" and "en-US") language match required
 			foreach ($available_languages as $language_code => $language_id) {
 				list ($language_code, ) = explode('-', $language_code);
 
 				if (($locale == $language_code) && $this->siteDomainLanguageEnabled($language_id)) {
 					return $language_id;
 				}
 			}
 
 			return false;
 		}
 
 		/**
 		 * Loads item from the database by given id
 		 *
 		 * @access public
 		 * @param mixed $id item id of keys->values hash to load item by
 		 * @param string $id_field_name Optional parameter to load item by given Id field
 		 * @param bool $cachable cache this query result based on it's prefix serial
 		 * @return bool True if item has been loaded, false otherwise
 		 * @throws kRedirectException
 		 */
 		public function Load($id, $id_field_name = null, $cachable = true)
 		{
 			$default = false;
 			if ($id == 'default') {
 				// domain based primary language
 				$default = true;
 				$id = $this->Application->siteDomainField('PrimaryLanguageId');
 
 				if ($id) {
 					$res = parent::Load($id, $id_field_name, $cachable);
 				}
 				else {
 					$res = parent::Load(1, 'PrimaryLang', $cachable);
 				}
 
 				if (
 					!$this->Application->isAdmin && !defined('GW_NOTIFY') && preg_match('/[\/]{0,1}index.php[\/]{0,1}/', $_SERVER['PHP_SELF']) &&
 					!$this->Application->HttpQuery->refererIsOurSite() && $this->Application->ConfigValue('UseContentLanguageNegotiation')
 				) {
 					$language_id = $this->processAcceptLanguage();
 
 					if ( $language_id != $this->GetID() ) {
 						// redirect to same page with found language
 						$url_params = Array (
 							'm_cat_id' => 0, 'm_cat_page' => 1,
 							'm_lang' => $language_id, 'm_opener' => 's',
 							'pass' => 'm'
 						);
 
 						$this->_addLoginState($url_params);
 						$exception = new kRedirectException('Redirect into language ID = <strong>' . $language_id . '</strong> according to "<strong>Accepted-Language</strong>" header "<strong>' . $_SERVER['HTTP_ACCEPT_LANGUAGE'] . '</strong>"');
 						$exception->setup('', $url_params);
 
 						throw $exception;
 					}
 				}
 			}
 			else {
 				$res = parent::Load($id, $id_field_name, $cachable);
 			}
 
 			if ($res) {
 				if (!$this->siteDomainLanguageEnabled($this->GetID())) {
 					// language isn't allowed in site domain
 					return $this->Clear();
 				}
 			}
 
 			if ($default) {
 				if (!$res) {
 					if ($this->Application->isAdmin) {
 						$res = parent::Load(1, $id_field_name, false);
 					}
 					else {
 						if (defined('IS_INSTALL')) {
 							// during first language import prevents sql errors
 							$this->setID(1);
 							$res = true;
 						}
 						else {
 							$this->Application->ApplicationDie('No Primary Language Selected');
 						}
 					}
 				}
 				$this->Application->SetVar('lang.current_id', $this->GetID() );
 				$this->Application->SetVar('m_lang', $this->GetID() );
 			}
 
 			return $res;
 		}
 
 		/**
 		 * Pass login state variables into new language url
 		 *
 		 * @param $url_params
 		 * @return void
 		 * @access protected
 		 */
 		protected function _addLoginState(&$url_params)
 		{
 			$pass_along = Array ('login', 'logout');
 
 			foreach ($pass_along as $pass_along_name) {
 				$pass_along_value = $this->Application->GetVar($pass_along_name);
 
 				if ( $pass_along_value !== false ) {
 					$url_params[$pass_along_name] = $pass_along_value;
 				}
 			}
 		}
 
 		/**
 		 * Checks, that language is enabled in site domain
 		 *
 		 * @param int $id
 		 * @return bool
 		 */
 		function siteDomainLanguageEnabled($id)
 		{
 			$available_languages = $this->Application->siteDomainField('Languages');
 
 			if ($available_languages) {
 				return strpos($available_languages, '|'  .$id . '|') !== false;
 			}
 
 			return true;
 		}
 	}
\ No newline at end of file
Index: branches/5.3.x/core/units/pdf/pdf_helper.php
===================================================================
--- branches/5.3.x/core/units/pdf/pdf_helper.php	(revision 16518)
+++ branches/5.3.x/core/units/pdf/pdf_helper.php	(revision 16519)
@@ -1,1026 +1,1026 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 //define('PDF_DEBUG_NO_TEXT', 1); // do not draw text
 //define('PDF_DEBUG_DUMP_ONLY', 1); // output elements dump and exit
 //define('PDF_DEBUG_DRAW_BOXES', 1); //
 //define('PDF_DEBUG_DRAW_BASELINE', 1); //
 //define('PDF_DEBUG_DRAW_BOX_INFO', '/.*/'); //
 //define('PDF_DEBUG_DRAW_BOX_INFO', '/(td|img)/i'); //
 //define('PDF_DEBUG_DRAW_MARGINS', 1); //
 //define('PDF_DEBUG_DRAW_ELEM_BORDERS', 1);
 //define('PDF_DEBUG_DRAW_LINE_BOXES', 1);
 //define('PDF_DRAW_CONTENT_AREA', 1);
 
 require_once FULL_PATH.'/core/units/pdf/pdf_styles.php';
 require_once FULL_PATH.'/core/units/pdf/pdf_text.php';
 require_once FULL_PATH.'/core/units/pdf/pdf_table.php';
 require_once FULL_PATH.'/core/units/pdf/pdf_image.php';
 require_once FULL_PATH.'/core/units/pdf/pdf_renderer.php';
 require_once FULL_PATH.'/core/units/pdf/pdf_renderer_tcpdf.php';
 
 class kPDFHelper extends kHelper {
 
 	/**
 	 * Enter description here...
 	 *
 	 * @var kPDFRenderer
 	 */
 	var $PDF;
 	var $CurPDFElem;
 
 	var $DimensionsMode = 1;
 
 	var $Stylesheet;
 
 	var $PtPerEm = 10;
 
 	public $Document = null;
 
 	const DM_NORMAL = 0;
 	const DM_SKIP = 1;
 
 	/**
 	 * Allows to convert given template contents into pdf document
 	 *
 	 * @param string $template (template name OR it's contents, see $raw_template)
 	 * @param Array $template_params
 	 * @param bool $is_content
 	 * @return string
 	 */
 	function BuildFromTemplate($template, $template_params = Array (), $is_content = false)
 	{
 		$this->Application->InitParser();
 
 		$this->Application->Parser->SetParams($template_params);
 
 		if ($is_content) {
 			$xml = $this->Application->Parser->Parse($template);
 		}
 		else {
 			$xml = $this->Application->Parser->Run($template);
 		}
 
+		/** @var kXMLHelper $xml_helper */
 		$xml_helper =& $this->Application->recallObject('kXMLHelper');
-		/* @var $xml_helper kXMLHelper */
 
 		$doc = $xml_helper->Parse($xml_helper->ConvertHTMLEntities($xml), kXMLHelper::XML_WITH_TEXT_NODES);
 		if ($doc->Name == 'ERROR') {
 			echo 'BAD TEMPLATE';
 			exit;
 		}
 
 //		$this->Application->Debugger->profileStart('pdf_init', 'Initializing PDF');
 		$this->InitPDF($doc);
 //		$this->Application->Debugger->profileFinish('pdf_init');
 //		$this->Application->Debugger->profileStart('process_nodes', 'Processing nodes');
 		$this->ProcessNode($doc);
 //		$this->Application->Debugger->profileFinish('process_nodes');
 
 		if (defined('PDF_DEBUG_DUMP_ONLY')) {
 			$this->DimensionsMode = kPDFHelper::DM_NORMAL ;
 			$this->Application->Debugger->profileStart('laying_out', 'Laying out nodes');
 //			$this->CurPDFElem->LayoutChildren();
 			$this->Application->Debugger->profileFinish('laying_out');
 			$this->Application->Debugger->profileStart('rendering', 'rendering');
 //			$this->Render();
 			$this->Application->Debugger->profileFinish('rendering');
 
 //			echo $this->CurPDFElem->DumpStructure();
 			exit;
 		}
 
 		$this->Render();
 
 		return $this->PDF->GetPDFString();
 //		exit;
 	}
 
 	function InitPDF($doc)
 	{
 		$this->PDF = new kTCPDFRenderer();
 
 		$this->Stylesheet = new kPDFStylesheet();
 
 		$this->CurPDFElem = kPDFElemFactory::CreateFromNode($doc, $this);
 		$this->Document = $this->CurPDFElem;
 //		$this->CurPDFElem = new kPDFPage($page1, new kXMLNode('_NONE_', array('style' => 'display: block; width: '.$page1->getWidth().';')), $this);
 		$this->CurPDFElem->Init();
 		$this->CurPDFElem->SetCSSProperty('width', $this->PDF->getWidth());
 		$this->CurPDFElem->SetCSSProperty('height', $this->PDF->getHeight());
 		$this->PDF->SetFont('helvetica', $this->PtPerEm);
 	}
 
 	function Render()
 	{
 		$this->DimensionsMode = kPDFHelper::DM_NORMAL ;
 		$this->CurPDFElem->LayoutChildren();
 		$this->PageBottom = $this->PDF->getHeight() - $this->Document->GetCSSProperty('margin-bottom'); // margin
 		$this->CurPDFElem->DrawAt($this->PDF, 0, 0);
 	}
 
 	function ProcessHead($node)
 	{
 		if ($node->Name == 'STYLE') {
 			$css = $node->Data;
 			$tokens = $this->Stylesheet->GetTokens($node->Data);
 			$this->Stylesheet->ParseTokens($tokens);
 		}
 		foreach($node->Children as $child) {
 			$this->ProcessHead($child);
 		}
 	}
 
 	function ProcessNode($node)
 	{
 		$children = count($node->Children);
 		foreach($node->Children as $child) {
 			if ($child->Name == 'HEAD') {
 				$this->ProcessHead($child);
 				continue;
 			}
 
 			$elem = kPDFElemFactory::CreateFromNode($child, $this);
 			if (!$elem)  continue;
 			$display = $elem->GetDisplayLevel();
 			if ($display == 'none')  continue;
 
 			// http://manual.prod.intechnic.lv/css21/visuren.html#anonymous-block-level
 			if ($display == 'block' && $this->CurPDFElem->GetDisplayLevel() == 'inline') {
 				$this->CurPDFElem->Closed();
 				$this->CurPDFElem = $this->CurPDFElem->GetContainingBlock();
 			}
 
 			$current = $this->CurPDFElem;
 			$line = false;
 			if ($display == 'inline' && !($this->CurPDFElem instanceof kPDFLine) ) {
 				$this->CurPDFElem = $this->CurPDFElem->GetLineBox();
 				$line = $this->CurPDFElem;
 			}
 
 				$this->CurPDFElem = $this->CurPDFElem->AddChild( $elem );
 
 			$this->ProcessNode($child);
 			$this->CurPDFElem = $current;
 		}
 		$this->CurPDFElem->Closed();
 	}
 }
 
 class kPDFElemFactory {
 	static function CreateFromNode($node, $helper)
 	{
 		/* @todo Create elements, based on their display, rather than tag name - pure CSS rendering */
 
 		switch ($node->Name) {
 			case '_TEXT_':
 //				$DOMNode = $node->Parent;
 				$elem = new kPDFTextElement($node->Data, $node, $helper);
 				if ($elem->CSSSpecifiedProperties['WHITE-SPACE'] == 'normal' && trim($node->Data) == '') {
 					return false;
 				}
 				return $elem;
 				break;
 			case 'TR':
 				return new kPDFTableRow($node, $helper);
 			case 'BR':
 				return new kPDFTextElement($node->Data, $node, $helper);
 			case 'TABLE':
 				return new kPDFTable($node, $helper);
 			case 'IMG':
 				return new kPDFImage($node, $helper);
 			default:
 				return new kPDFElement($node, $helper);
 				break;
 		}
 	}
 }
 
 class kPDFElement {
 	public $Parent;
 	protected $Font;
 	protected $FontSize;
 	public $Children = array();
 
 	public $Position = 0;
 
 	public $FirstChild;
 	public $LastChild;
 
 	public $ContentHeight = 0;
 
 	public $Style;
 
 	public $CurX = 0;
 	public $CurY = 0;
 
 	public $Baseline = 0;
 	public $Ascent;
 	public $Descent;
 	public $Gap;
 
 	public $Node;
 	public $Helper;
 
 	public $CSSSpecifiedProperties = array();
 	public $CSSComputedPoperties = array();
 	public $DirectStyle;
 
 	public $IsClosed = false;
 
 	public $LayedOut = false;
 
 	public $WidthComputed = false;
 
 	public $MinContentWidth = 0;
 	public $MaxContentWidth = 0;
 
 	public $CurLine_MinContentWidth = 0;
 	public $CurLine_MaxContentWidth = 0;
 
 	public $Spacers = 0;
 
 
 	function __construct($node, $helper)
 	{
 		$this->Node = $node;
 		$this->Helper = $helper;
 		$this->ProcessCSS();
 	}
 
 	function Init()
 	{
 		$this->ComputeCSSProperties();
 	}
 
 	function Reset()
 	{
 		$this->CurX = 0;
 		$this->CurY = 0;
 	}
 
 	function AddChild($child, $init=true, $after=null)
 	{
 		$node_count = count($this->Children);
 		if (isset($after)) {
 			$after_pos = $after->Position;
 			for($i=$after_pos+1; $i<$node_count; $i++) {
 				$this->Children[$i]->Position++;
 			}
 			array_splice($this->Children, $after_pos+1, 0, array($child));
 			$child->Position = $after_pos+1;
 		}
 		else {
 			$child->Position = $node_count;
 			$this->Children[] = $child;
 		}
 		if ($node_count == 0) {
 			$this->FirstChild = $child;
 			$this->LastChild = $child;
 		}
 		elseif ($child->Position == $node_count) {
 			$this->LastChild = $child;
 		}
 
 		$child->Parent = $this;
 		if ($init) $child->Init();
 		return $child;
 	}
 
 	public function Closed()
 	{
 		if ($this->LastChild && $this->LastChild instanceof kPDFLine && !$this->LastChild->IsClosed) {
 			$this->LastChild->Closed();
 		}
 		$this->ComputeWidthAndMargins();
 		$this->CalcMinMaxContentWidth();
 		$this->IsClosed = true;
 		return ;
 	}
 
 	function RemoveChildren($start, $count=null)
 	{
 		return array_splice($this->Children, $start);
 	}
 
 	function &FindChildByProperty($property, $value)
 	{
 		$property = strtoupper($property);
 		if (strtoupper($this->GetCSSProperty($property)) == strtoupper($value)) return $this;
 		foreach ($this->Children as $elem)
 		{
 			$child =& $elem->FindChildByProperty($property, $value);
 			if ($child !== false)
 			{
 				return $child;
 			}
 		}
 		$false = false;
 		return $false;
 	}
 
 	function LayoutChildren()
 	{
 		$this->ComputeWidthAndMargins();
 		$i = 0;
 		$this->Reset();
 		while (isset($this->Children[$i])) { // can't use foreach here, because LayoutChildren() may add new children to current elem (wrapping)
 			$child = $this->Children[$i];
 			$child->LayoutChildren();
 			$i++;
 		}
 		$this->CheckDimensions();
 		$this->ComputeHeight();
 //		$this->ComputeBaseline();
 	}
 
 	public function ComputeHeight()
 	{
 		$display = $this->GetCSSProperty('display');
 		if  ($display == 'inline') return ;
 
 		$height = 0; // $this->GetCSSProperty('height');
 	/*	$extra_height =
 					$this->GetCSSProperty('margin-top') +
 					$this->GetCSSProperty('margin-bottom') +
 					$this->GetCSSProperty('padding-top') +
 					$this->GetCSSProperty('padding-bottom') +
 					$this->GetCSSProperty('border-top-width') +
 					$this->GetCSSProperty('border-bottom-width');*/
 
 		foreach ($this->Children as $elem) {
 			$dim = $elem->GetBoxDimensions();
 			$elem_height = $dim[1];
 			if ($elem->GetDisplayLevel() == 'block' && $elem->GetCSSProperty('display') != 'table-cell') {
 				$height += $elem_height;
 			}
 			else {
 				if ($elem_height > $height) {
 					$height = $elem_height;
 				}
 			}
 		}
 		$this->SetCSSProperty('height', $height);
 	}
 
 	function &FindChild($name)
 	{
 		$name = strtoupper($name);
 		if ($this->Node->Name == $name) return $this;
 		foreach ($this->Children as $elem)
 		{
 			$child =& $elem->FindChild($name);
 			if ($child !== false)
 			{
 				return $child;
 			}
 		}
 		$false = false;
 		return $false;
 	}
 
 	function DumpStructure($level=0)
 	{
 		$dump = '';
 		$tab = str_repeat('&nbsp;', $level*4);
 		$dump .= $tab . get_class($this) . ' Node: ' . $this->Node->Name . " child of ".$this->Node->Parent->Name."<br>\n";
 		if ($this instanceof kPDFTextElement) {
 			$dump .= $tab . 'Data: ' . $this->Data . "<br>\n";
 		}
 		$dump .= $tab . 'Width: ' . $this->GetCSSProperty('width') . ' Height: ' . $this->GetCSSProperty('height') . " Ascent: " . $this->Ascent . "<br>\n";
 		$dump .= $tab . 'MinCW: ' . $this->MinContentWidth . ' MaxCW: ' . $this->MaxContentWidth . "<br>\n";
 		$dump .= $tab . 'Children:' . "<br>\n";
 		$i = 0;
 		foreach ($this->Children as $elem)
 		{
 			$i++;
 			$dump .= $tab . $i . "<br>\n";
 			$level++;
 			$dump .= $elem->DumpStructure($level);
 			$level--;
 		}
 		return $dump;
 	}
 
 	function DrawAt($page, $x=0, $y=0, $spacer_w=0)
 	{
 		if ($this->Node->Name == 'FOOTER') {
 			$dim = $this->GetBoxDimensions();
 			$y = $this->Helper->PDF->GetHeight() - $dim[1];
 		}
 
 		if ($this->GetDisplayLevel() == 'block' ) {
 			$width = $this->GetCSSProperty('width');
 			$margin_left = $this->GetCSSProperty('margin-left');
 			$margin_right = $this->GetCSSProperty('margin-right');
 			$border_left = $this->GetCSSProperty('border-left-width');
 			$border_right = $this->GetCSSProperty('border-right-width');
 			$padding_left = $this->GetCSSProperty('padding-left');
 			$padding_right = $this->GetCSSProperty('padding-right');
 
 			$height = $this->GetCSSProperty('height');
 			$margin_top = $this->GetCSSProperty('margin-top');
 			$margin_bottom = $this->GetCSSProperty('margin-bottom');
 			$border_top = $this->GetCSSProperty('border-top-width');
 			$border_bottom = $this->GetCSSProperty('border-bottom-width');
 			$padding_top = $this->GetCSSProperty('padding-top');
 			$padding_bottom = $this->GetCSSProperty('padding-bottom');
 
 			$outer_width = $margin_left + $border_left + $padding_left + $width + $padding_right + $border_right + $margin_right;
 			$outer_height = $margin_top + $border_top + $padding_top + $height + $padding_bottom + $border_bottom + $margin_bottom;
 
 			if (defined('PDF_DEBUG_DRAW_BOXES')) {
 				$page->SetFillColor( '#eeeeee' );
 				if ($this instanceof kPDFLine) {
 					if (defined('PDF_DEBUG_DRAW_LINE_BOXES')) {
 						$page->SetLineWidth(0.5);
 						$page->SetLineColor( 'yellow' );
 						$page->SetFillColor( '#efefef' );
 					}
 				}
 				else {
 					$page->SetLineWidth(0.1);
 					$page->SetLineColor( '#0000ff' );
 				}
 //				$page->DrawRectangle($x, $y, $x + $outer_width, $y - $outer_height, kPDFRenderer::SHAPE_DRAW_FILL_AND_STROKE);
 				$page->SetFillColor( '#000000' );
 				$page->setFont('helvetica', 6);
 				if (defined('PDF_DEBUG_DRAW_BOX_INFO') && preg_match(PDF_DEBUG_DRAW_BOX_INFO, $this->Node->Name)) {
 					$page->drawText($this->Node->Name . "{$outer_width}x{$outer_height} ".get_class($this), $x+2, $y+8);
 				}
 			}
 		}
 
 		if ($this->GetDisplayLevel() == 'block' && !($this instanceof kPDFLine)) {
 			// MARGINS
 			if (defined('PDF_DEBUG_DRAW_MARGINS')) {
 				$page->SetLineWidth(1);
 				$page->SetLineColor( 'green' );
 				$page->DrawLine($x, $y, $x + $margin_left, $y);
 				$page->DrawLine($x, $y, $x, $y + $margin_bottom);
 				$page->SetLineWidth(0.3);
 				$page->DrawLine($x + $margin_left, $y, $x + $margin_left, $y + 3);
 				$page->DrawLine($x, $y + $margin_top, $x + 3, $y + $margin_top);
 			}
 			$x += $margin_left;
 			$y += $margin_top;
 
 			// BACKGROUND
 			// http://manual.prod.intechnic.lv/css21/colors.html#q2
 			$body = false;
 			if ($this->Node->Name == 'HTML' && $this->GetCSSProperty('background-color') == 'transparent') {
 				// get BODY color
 				$body = $this->FindChild('BODY');
 				if ($body !== false) {
 					$background_color = $body->GetCSSProperty('background-color');
 					$body->SetCSSProperty('background-color', 'transparent');
 				}
 			}
 			else {
 				$background_color = $this->GetCSSProperty('background-color');
 			}
 			if ($background_color != 'transparent') {
 				$page->SetFillColor( $background_color );
 				$x1 = $x + 	$border_left +
 										$padding_left +
 										$width +
 										$padding_right +
 										$border_right;
 				$y1 = $y + ($border_top +
 										$padding_top +
 										$height +
 										$padding_bottom +
 										$border_bottom);
 				$page->DrawRectangle($x, $y, $x1, $y1, kPDFRenderer::SHAPE_DRAW_FILL);
 			}
 
 			// BORDERS
 			$x2 = $x + $border_left + $padding_left + $width + $padding_right + $border_right;
 			$y2 = $y + ($border_top + $padding_top + $height + $padding_bottom + $border_bottom);
 
 			if ($this->GetCSSProperty('border-top-style') != 'none' && $border_top > 0) {
 				$page->SetLineWidth($this->GetCSSProperty('border-top-width'));
 				$page->SetLineColor( $this->GetCSSProperty('border-top-color') );
 				$page->DrawLine($x+$border_left/2, $y+$border_top/2, $x2-$border_right/2, $y+$border_top/2);
 			}
 			if ($this->GetCSSProperty('border-right-style') != 'none' && $border_right > 0) {
 				$page->SetLineWidth($this->GetCSSProperty('border-right-width'));
 				$page->SetLineColor( $this->GetCSSProperty('border-right-color') );
 				$page->DrawLine($x2-$border_right/2, $y+$border_top/2, $x2-$border_right/2, $y2-$border_bottom/2);
 			}
 			if ($this->GetCSSProperty('border-bottom-style') != 'none' && $border_bottom > 0) {
 				$page->SetLineWidth($this->GetCSSProperty('border-bottom-width'));
 				$page->SetLineColor( $this->GetCSSProperty('border-bottom-color') );
 				$page->DrawLine($x+$border_left/2, $y2-$border_bottom/2, $x2-$border_right/2, $y2-$border_bottom/2);
 			}
 			if ($this->GetCSSProperty('border-left-style') != 'none' && $border_left > 0) {
 				$page->SetLineWidth($this->GetCSSProperty('border-left-width'));
 				$page->SetLineColor( $this->GetCSSProperty('border-left-color'));
 				$page->DrawLine($x+$border_left/2, $y+$border_top/2, $x+$border_left/2, $y2-$border_bottom/2);
 			}
 			$x += $border_left;
 			$y += $border_top;
 
 			// PADDING
 			$x += $this->GetCSSProperty('padding-left');
 			$y += $this->GetCSSProperty('padding-top');
 
 			if (defined('PDF_DRAW_CONTENT_AREA') && $this->Parent) {
 				$page->SetFillColor(  'pink' ) ;
 				$page->DrawRectangle($x, $y, $x + $width, $y + $height, kPDFRenderer::SHAPE_DRAW_FILL);
 			}
 
 		}
 
 		$this->CurX = $x;
 		$this->CurY = $y;
 //		$max_width = $this->GetCSSProperty('max-width');
 		$this->TopLine = $y;
 		$page->SetLineWidth(0.1);
 
 		foreach ($this->Children as $elem)
 		{
 			$dim = $elem->GetBoxDimensions();
 			$align_offset_x = 0;
 			$align_offset_y = 0;
 			if ($elem->GetDisplayLevel() == 'inline') {
 				if ($this->GetCSSProperty('vertical-align') == 'baseline') {
 					$align_offset_y = $this->Ascent - $elem->Ascent;
 				}
 			}
 			if (defined('PDF_DEBUG_DRAW_BASELINE')) {
 				$page->SetLineWidth(0.5);
 				$page->SetLineColor( '#ff0000' );
 				$page->DrawLine($this->CurX, $this->CurY + $elem->Ascent, $this->CurX + $dim[0], $this->CurY + $elem->Ascent);
 			}
 			if ($elem instanceof kPDFLine ) {
 				$spacer_w = 0;
 				switch ($elem->GetCSSProperty('text-align')) {
 					case 'center':
 						$align_offset_x = ($dim[0] - $elem->CurX)/2;
 						break;
 					case 'right':
 						$align_offset_x = ($dim[0] - $elem->CurX);
 						break;
 					case 'justify':
 						$spacer_w = $elem->LastLine ? 0 : ($dim[0] - $elem->CurX)/$elem->Spacers;
 				}
 			}
 			if (defined('PDF_DEBUG_DRAW_ELEM_BORDERS')) {
 				$page->SetLineWidth(0.1);
 				$page->SetLineColor( '#bbbbbb' );
 				$page->SetFillColor( '#bbbbbb' );
 				$page->setFont('helvetica', 4);
 				$page->DrawRectangle($this->CurX, $this->CurY + $align_offset_y, $this->CurX + $dim[0], $this->CurY + $align_offset_y + $dim[1], kPDFRenderer::SHAPE_DRAW_STROKE);
 				if (defined('PDF_DEBUG_DRAW_BOX_INFO')  && preg_match(PDF_DEBUG_DRAW_BOX_INFO, $this->Node->Name) && $elem->GetDisplayLevel() != 'block') {
 					$page->drawText("w:{$dim[0]}x{$dim[1]}", $this->CurX + 2, $this->CurY + $align_offset_y + 6);
 				}
 			}
 			$tmp_x = $this->CurX;
 			$this->CheckPageBreak($page, $elem, $dim);
 			$elem->DrawAt($page, $this->CurX + $align_offset_x, $this->CurY + $align_offset_y, $spacer_w);
 			if ($elem->GetDisplayLevel() == 'block' && $elem->GetCSSProperty('display') != 'table-cell') {
 				$this->CurY += $dim[1];
 				$this->CurX = $tmp_x;
 			}
 			else {
 				$this->CurX = $this->CurX + $dim[0] + ($elem->Spacers*$spacer_w);
 			}
 		}
 		if ($this->GetCSSProperty('PAGE-BREAK-AFTER') == 'always') {
 			$this->Helper->PDF->NextPage();
 			$this->Parent->CurY = $this->Helper->Document->GetCSSProperty('margin-top');
 		}
 	}
 
 	function CheckPageBreak($page, $elem, $dim)
 	{
 		if (($this->GetCSSProperty('DISPLAY') != 'block' && $this->GetCSSProperty('DISPLAY') != 'table') || $elem->Node->Name == 'BODY' || $elem->Node->Name == 'HTML') return;
 
 		if ($this->CurY + $dim[1] > $this->Helper->PageBottom) {
 			$this->Helper->PDF->NextPage();
 			$this->CurY = $this->Helper->Document->FindChild('BODY')->GetCSSProperty('margin-top');
 		}
 	}
 
 	function GetBoxDimensions()
 	{
 		return array(
 			$this->GetCSSProperty('margin-left') +
 			$this->GetCSSProperty('border-left-width') +
 			$this->GetCSSProperty('padding-left') +
 			$this->GetCSSProperty('width') +
 			$this->GetCSSProperty('padding-right') +
 			$this->GetCSSProperty('border-right-width') +
 			$this->GetCSSProperty('margin-right'),
 
 			$this->GetCSSProperty('margin-top') +
 			$this->GetCSSProperty('border-top-width') +
 			$this->GetCSSProperty('padding-top') +
 			$this->GetCSSProperty('height') +
 			$this->GetCSSProperty('padding-bottom') +
 			$this->GetCSSProperty('border-bottom-width') +
 			$this->GetCSSProperty('margin-bottom'),
 		);
 	}
 
 	function GetLineBox($first=false) {
 		if ($this instanceof kPDFLine ) {
 			if ($first) {
 				return $this->Parent->FirstChild;
 			}
 			else {
 				return $this;
 			}
 		}
 		if ($this->GetDisplayLevel() == 'block') {
 			if ($this->LastChild instanceof kPDFLine ) {
 				return $this->LastChild;
 			}
 			return $this->AddChild( new kPDFLine($this->Node, $this->Helper));
 		}
 
 		//in-line box
 		return $this->Parent->GetLineBox();
 	}
 
 	function GetTable() {
 		if ($this instanceof kPDFTable) {
 			return $this;
 		}
 		if ($this->Parent) {
 			return $this->Parent->GetTable();
 		}
 		return false;
 	}
 
 	function GetDisplayLevel()
 	{
 		// http://manual.prod.intechnic.lv/css21/visuren.html#q5
 		$display = $this->GetCSSProperty('display');
 		if (!$display) $display = $this->CSSSpecifiedProperties['DISPLAY'];
 		switch ($display) {
 			case 'block':
 			case 'list-item':
 			case 'table':
 			case 'table-cell':
 			case 'table-row':
 			case 'table':
 				return 'block';
 			case 'run-in':
 				// do special processing here: http://manual.prod.intechnic.lv/css21/visuren.html#run-in
 				return 'block';
 			case 'none':
 				return 'none';
 		}
 		return 'inline';
 	}
 
 	function ProcessCSS()
 	{
 		$supported_properties = array(
 			'DISPLAY',
 			'FONT-SIZE', // SHOULD BE FIRST, BECAUSE ALL EM UNITS RELY ON IT
 			'WIDTH','MAX-WIDTH','MIN-WIDTH',
 			'HEIGHT',
 			'COLOR',
 			'FONT-FAMILY', 'FONT-WEIGHT', 'FONT-STYLE', 'FONT-VARIANT',
 			'WHITE-SPACE',
 			'VERTICAL-ALIGN',
 			'MARGIN-LEFT', 'MARGIN-RIGHT', 'MARGIN-TOP', 'MARGIN-BOTTOM',
 			'BORDER-TOP-STYLE', 'BORDER-RIGHT-STYLE', 'BORDER-BOTTOM-STYLE', 'BORDER-LEFT-STYLE',
 			'BORDER-TOP-WIDTH', 'BORDER-RIGHT-WIDTH', 'BORDER-BOTTOM-WIDTH', 'BORDER-LEFT-WIDTH',
 			'BORDER-TOP-COLOR', 'BORDER-RIGHT-COLOR', 'BORDER-BOTTOM-COLOR', 'BORDER-LEFT-COLOR',
 			'PADDING-TOP', 'PADDING-RIGHT', 'PADDING-BOTTOM', 'PADDING-LEFT',
 			'BACKGROUND-COLOR',
 			'TEXT-ALIGN', 'TEXT-TRANSFORM',
 			'TABLE-LAYOUT',
 			'PAGE-BREAK-AFTER'
 		);
 
 		$cascade = $this->Helper->Stylesheet->GetAllProperties($this->Node);
 
 		foreach ($supported_properties as $property) {
 			$value = false;
 			// !!! The following needs to be fixed somehow - thereis no major need in cascading properties for kPDFTextElement and kPDFLine also...
 			if (!($this instanceof kPDFTextElement) || ($this instanceof kPDFTextElement && $property != 'DISPLAY')) {
 				 $value = isset($cascade[$property]) ? $cascade[$property] : false;
 			}
 			if (!$value && kCSSDefaults::IsInherited($property)) {
 				$value = $this->FindInheritedValue($property);
 			}
 			if (!$value) {
 				$value = kCSSDefaults::GetDefaultValue($property);
 			}
 			$this->CSSSpecifiedProperties[$property] = $value;
 		}
 		$this->Node->CssProperties = $this->CSSSpecifiedProperties;
 	}
 
 	function FindInheritedValue($property)
 	{
 		$node = $this->Node;
 		if (!$node->Parent) {
 			return false;
 		}
 		do {
 			$node = $node->Parent;
 			$value = isset($node->ComputedCSSProperties[$property]) ? $node->ComputedCSSProperties[$property] : false;
 		} while (!$value && $node->Parent);
 		return $value;
 	}
 
 	function ComputeCSSProperties()
 	{
 		foreach ($this->CSSSpecifiedProperties as $property => $value) {
 			$this->SetCSSProperty($property, $this->ComputeCSSProperty($property, $value));
 		}
 		$this->ComputeWidthAndMargins();
 		/*if ($this->GetDisplayLevel() ==  'inline') {
 			$props = array(
 				'margin-top' => 0,
 				'margin-right' => 0,
 				'margin-bottom' => 0,
 				'margin-left' => 0,
 				'width' => 0,
 			);
 			foreach ($props as $name => $value) {
 				$this->SetCSSProperty($name, $value);
 			}
 		}*/
 		$this->Node->ComputedCSSProperties = $this->CSSComputedPoperties;
 	}
 
 	function ComputeWidthAndMargins()
 	{
 		if ($this->WidthComputed) return ;
 
 		if ($this->GetDisplayLevel() == 'inline') {
 			return;
 		}
 
 		if (!$this->Parent) {
 			$this->WidthComputed = true;
 			return ;
 		}
 		$cb = $this->GetContainingBlock();
 		$cb_width = $cb->GetCSSProperty('width'); // containing block width
 		if (!$cb->WidthComputed) { // this means we are inside an element which width is not yet defined (nested TABLE for instance)
 			return ;
 		}
 		if ($this instanceof kPDFLine) { // otherwise margins will be applied from line containing block to the line
 			$this->SetCSSProperty('width', $cb_width);
 			return;
 		}
 
 		// 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' = width of containing block
 		$width = $this->GetCSSProperty('width'); // may be auto
 		$margin_left = $this->GetCSSProperty('margin-left'); // may be auto
 		$margin_right = $this->GetCSSProperty('margin-right'); // may be auto
 		$border_left = $this->GetCSSProperty('border-left-width');
 		$border_right = $this->GetCSSProperty('border-right-width');
 		$padding_left = $this->GetCSSProperty('padding-left');
 		$padding_right = $this->GetCSSProperty('padding-right');
 
 		if ($width == 'auto' && $this->Parent) {
 			if ($margin_left == 'auto') {
 				$margin_left = 0;
 			}
 			if ($margin_right == 'auto') {
 				$margin_right = 0;
 			}
 			$width = $cb_width - $margin_left - $border_left - $padding_left - $padding_right - $border_right - $margin_right;
 		}
 		elseif ($margin_left != 'auto' && $margin_right != 'auto') { //over-constrained
 			$margin_right = $cb_width - $width - $margin_left - $border_left - $padding_left - $padding_right - $border_right;
 		}
 		elseif ($margin_left == 'auto' && $margin_right == 'auto') {
 			$margin_left = ($cb_width - $border_left - $padding_left - $width - $padding_right - $border_right)/2;
 			$margin_right = $margin_left;
 		}
 
 		$this->SetCSSProperty('width', $width);
 		$this->SetCSSProperty('margin-right', $margin_right);
 		$this->SetCSSProperty('margin-left', $margin_left);
 		$this->WidthComputed = true;
 	}
 
 	function ComputeCSSProperty($property, $value)
 	{
 		if ($property == 'FONT-WEIGHT') {
 			if ($value == 'normal') {
 				return 400;
 			}
 			if ($value == 'bold') {
 				return 700;
 			}
 			if ($value == 'bolder') {
 				if (!$this->Parent) {
 					return 700;
 				}
 				else {
 					return max($this->Parent->GetCSSProperty('font-weight') + 300, 900);
 				}
 			}
 			if ($value == 'lighter') {
 				if (!$this->Parent) {
 					return 400;
 				}
 				else {
 					return min($this->Parent->GetCSSProperty('font-weight') - 300, 100);
 				}
 			}
 			if (!is_integer($value)) {
 				return 400;
 			}
 			return $value;
 		}
 
 		if (preg_match('/([.0-9]+)em/i', $value, $regs)) {
 			$cb = $this->GetContainingBlock();
 			if ($property == 'FONT-SIZE') {
 				if (!$cb) {
 					$value = $regs[1] * $this->Helper->PtPerEm;
 				}
 				else {
 					$value = $cb->GetCSSProperty('font-size') * $regs[1];
 				}
 			}
 			else {
 				if ($cb) {
 					$value = $cb->GetCSSProperty('font-size') * $regs[1];
 				}
 			}
 		}
 		elseif (preg_match('/([.0-9]+)(px)/i', $value, $regs)) {
 			$value = $regs[1] * 72 / 96;
 		}
 		elseif (preg_match('/([.0-9]+)(pt)/i', $value, $regs)) {
 			$value = $regs[1];
 		}
 		elseif (preg_match('/([.0-9]+)%/i', $value, $regs)) {
 			$cb = $this->GetContainingBlock();
 			if ($cb && ($property != 'WIDTH' || ($property == 'WIDTH' && $cb->WidthComputed))) {
 				$value = $regs[1]/100 * $cb->GetCSSProperty($property);
 			}
 		}
 
 		if ($property == 'FONT-SIZE' && preg_match('/(xx-small|x-small|small|medium|large|x-large|xx-large)/i', $value)) {
 			switch (strtolower($value)) {
 				case 'xx-small':
 					return $this->Helper->PtPerEm * 0.5;
 				case 'x-small':
 					return $this->Helper->PtPerEm * 0.7;
 				case 'small':
 					return $this->Helper->PtPerEm * 0.8;
 				case 'medium':
 					return $this->Helper->PtPerEm;
 				case 'large':
 					return $this->Helper->PtPerEm * 1.2;
 				case 'x-large':
 					return $this->Helper->PtPerEm * 1.4;
 				case 'xx-large':
 					return $this->Helper->PtPerEm * 1.6;
 			}
 		}
 //		elseif ($value == 'none') {
 //			$value = 0;
 //		}
 		return $value;
 	}
 
 	function GetContainingBlock()
 	{
 		if (!$this->Parent) return false;
 		$parent_display = $this->Parent->GetCSSProperty('display');
 		if (preg_match('/^(block|inline-block|table|table-cell|list-item)$/i', $parent_display)) {
 			return $this->Parent;
 		}
 		return $this->Parent->GetContainingBlock();
 	}
 
 	function GetCSSProperty($property)
 	{
 		$property = strtoupper($property);
 		return isset($this->CSSComputedPoperties[$property]) ? $this->CSSComputedPoperties[$property] : false;
 	}
 
 	function SetCSSProperty($name, $value)
 	{
 		$this->CSSComputedPoperties[strtoupper($name)] = $value;
 	}
 
 	function CheckDimensions()
 	{
 		$this->ComputeBaseline();
 	}
 
 	function ComputeBaseline()
 	{
 		if (!$this->Parent) return ;
 		$display = $this->GetCSSProperty('display');
 		/*$dim = $this->GetBoxDimensions();
 		$this->Ascent = $dim[1];*/
 		if ($display == 'inline' || $display == 'table-cell' || $this instanceof kPDFLine) {
 			if ($this->Parent->Ascent < $this->Ascent) {
 				$this->Parent->Ascent = $this->Ascent;
 			}
 			if ($this->Parent->Descent < $this->Descent) {
 				$this->Parent->Descent = $this->Descent;
 			}
 			if ($this->Parent->Gap < $this->Gap) {
 				$this->Parent->Gap = $this->Gap;
 			}
 			$this->Parent->ComputeBaseline();
 		}
 	}
 
 	function ContentWidthNewLine()
 	{
 		if ($this->CurLine_MinContentWidth > $this->MinContentWidth) {
 			$this->MinContentWidth = $this->CurLine_MinContentWidth;
 		}
 		if ($this->CurLine_MaxContentWidth > $this->MaxContentWidth) {
 			$this->MaxContentWidth = $this->CurLine_MaxContentWidth;
 		}
 		$this->CurLine_MinContentWidth = 0;
 		$this->CurLine_MaxContentWidth = 0;
 	}
 
 	function CalcMinMaxContentWidth() {
 		if (!$this->Parent) return ;
 		$this->ContentWidthNewLine();
 		$extra_width =
 				$this->GetCSSProperty('margin-left') +
 				$this->GetCSSProperty('margin-right') +
 				$this->GetCSSProperty('padding-left') +
 				$this->GetCSSProperty('padding-right') +
 				$this->GetCSSProperty('border-left-width') +
 				$this->GetCSSProperty('border-right-width');
 //		$extra_width = 0;
 		$this->MinContentWidth += $extra_width;
 		$this->MaxContentWidth += $extra_width;
 		$display = $this->GetCSSProperty('display');
 
 		if (($display == 'inline' || $display == 'table-cell')) {
 			$this->Parent->CurLine_MinContentWidth += $this->MinContentWidth;
 			$this->Parent->CurLine_MaxContentWidth += $this->MaxContentWidth;
 			if ($this->Node->Name == 'BR') {
 				$this->Parent->ContentWidthNewLine();
 			}
 		}
 		else {
 			if ($this->MinContentWidth > $this->Parent->MinContentWidth) {
 				$this->Parent->MinContentWidth = $this->MinContentWidth;
 //				$this->Parent->CalcMinMaxContentWidth();
 			}
 			if ($this->MaxContentWidth > $this->Parent->MaxContentWidth) {
 				$this->Parent->MaxContentWidth = $this->MaxContentWidth;
 //				$this->Parent->CalcMinMaxContentWidth();
 			}
 		}
 //		$this->ContentWidthNewLine();
 	}
 
 
 }
 
 class kPDFLine extends kPDFElement {
 	public $LastLine = true;
 
 	function __construct($node, $helper)
 	{
 		$line_node = new kXMLNode('_LINE_', array('STYLE' => 'display: block'));
 //		$line_node->SetParent($node);
 		$node->AddChild($line_node);
 		parent::__construct($line_node, $helper);
 	}
 
 	function Init()
 	{
 		parent::Init();
 		$this->SetCSSProperty('display', 'block');
 		$this->SetCSSProperty('margin-left', '0');
 		$this->SetCSSProperty('margin-right', '0');
 		$this->SetCSSProperty('margin-top', '0');
 		$this->SetCSSProperty('margin-bottom', '0');
 		$this->SetCSSProperty('padding-left', '0');
 		$this->SetCSSProperty('padding-right', '0');
 		$this->SetCSSProperty('padding-top', '0');
 		$this->SetCSSProperty('padding-bottom', '0');
 	}
 
 }
\ No newline at end of file
Index: branches/5.3.x/core/units/permissions/permissions_event_handler.php
===================================================================
--- branches/5.3.x/core/units/permissions/permissions_event_handler.php	(revision 16518)
+++ branches/5.3.x/core/units/permissions/permissions_event_handler.php	(revision 16519)
@@ -1,261 +1,263 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class PermissionsEventHandler extends kDBEventHandler {
 
 	/**
 	 * Allows to override standard permission mapping
 	 *
 	 * @return void
 	 * @access protected
 	 * @see kEventHandler::$permMapping
 	 */
 	protected function mapPermissions()
 	{
 		parent::mapPermissions();
 
 		$permissions = Array (
 			'OnGroupSavePermissions' => Array ('subitem' => 'advanced:manage_permissions'),
 		);
 
 		$this->permMapping = array_merge($this->permMapping, $permissions);
 	}
 
 	/**
 	 * Save category permissions
 	 *
 	 * @param kEvent $event
 	 */
 	function OnCategorySavePermissions($event)
 	{
 		$group_id = $this->Application->GetVar('current_group_id');
 		$category_id = $this->Application->GetVar('c_id');
 		$permissions = $this->Application->GetVar($event->getPrefixSpecial(true));
 
 		if (isset($permissions[$group_id])) {
 			$permissions = $permissions[$group_id];
 
 			$object = $event->getObject( Array('skip_autoload' => true) );
+
+			/** @var kPermissionsHelper $permissions_helper */
 			$permissions_helper = $this->Application->recallObject('PermissionsHelper');
-			/* @var $permissions_helper kPermissionsHelper */
 
 			$permissions_helper->LoadPermissions($group_id, $category_id, 0, 'c');
 
 			// format: <perm_name>['inherited'] || <perm_name>['value']
 
 			$delete_ids = Array();
 			$create_sql = Array();
 			$update_sql = Array();
 			$create_mask = '(%s,%s,'.$group_id.',%s,0,'.$category_id.')';
 			$new_id = (int)$this->Conn->GetOne('SELECT MIN('.$object->IDField.') FROM '.$object->TableName);
 			if($new_id > 0) $new_id = 0;
 			--$new_id;
 
 			foreach ($permissions as $perm_name => $perm_data) {
 				$inherited = $perm_data['inherited'];
 				$perm_value = isset($perm_data['value']) ? $perm_data['value'] : false;
 				$perm_id = $permissions_helper->getPermissionID($perm_name);
 
 				if ($inherited && ($perm_id != 0)) {
 					// permission become inherited (+ direct value was set before) => DELETE
 					$delete_ids[] = $permissions_helper->getPermissionID($perm_name);
 				}
 
 				if (!$inherited) {
 					// not inherited
 					if (($perm_id != 0) && ($perm_value != $permissions_helper->getPermissionValue($perm_name))) {
 						// record was found in db & new value differs from old one => UPDATE
 						$update_sql[$perm_id] = '	UPDATE '.$object->TableName.'
 													SET PermissionValue = '.$perm_value.'
 													WHERE (PermissionId = '.$perm_id.')';
 					}
 
 					if ($perm_id == 0) {
 						// not found in db, but set directly => INSERT
 						$create_sql[] = sprintf($create_mask, $new_id--, $this->Conn->qstr($perm_name), $this->Conn->qstr($perm_value));
 					}
 				}
 				// permission state was not changed in all other cases
 			}
 
 			$this->UpdatePermissions($event, $create_sql, $update_sql, $delete_ids);
 		}
 
 		$event->MasterEvent->SetRedirectParam('item_prefix', $this->Application->GetVar('item_prefix'));
 		$event->MasterEvent->SetRedirectParam('group_id', $this->Application->GetVar('group_id'));
 	}
 
 	/**
 	 * Saves permissions while editing group
 	 *
 	 * @param kEvent $event
 	 *
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnGroupSavePermissions($event)
 	{
 		if ( !$this->Application->CheckPermission('in-portal:user_groups.advanced:manage_permissions', 1) ) {
 			// no permission to save permissions
 			return ;
 		}
 
 		$permissions = $this->Application->GetVar($event->getPrefixSpecial(true));
 		if ( !$permissions ) {
 			return ;
 		}
 
+		/** @var kDBItem $object */
 		$object = $event->getObject( Array ('skip_autoload' => true) );
-		/* @var $object kDBItem */
 
 		$group_id = $this->Application->GetVar('g_id');
+
+		/** @var kPermissionsHelper $permissions_helper */
 		$permissions_helper = $this->Application->recallObject('PermissionsHelper');
-		/* @var $permissions_helper kPermissionsHelper */
 
 		$permissions_helper->LoadPermissions($group_id, 0, 1, 'g');
 
 		$delete_ids = $create_sql = Array ();
 		$create_mask = '(%s,%s,' . $group_id . ',%s,1,0)';
 
 		$new_id = (int)$this->Conn->GetOne('SELECT MIN(' . $object->IDField . ') FROM ' . $object->TableName);
 		if ( $new_id > 0 ) {
 			$new_id = 0;
 		}
 		--$new_id;
 
+		/** @var kSectionsHelper $sections_helper */
 		$sections_helper = $this->Application->recallObject('SectionsHelper');
-		/* @var $sections_helper kSectionsHelper */
 
 		foreach ($permissions as $section_name => $section_permissions) {
 			$section_name = $sections_helper->getPermSection($section_name);
 
 			foreach ($section_permissions as $perm_name => $perm_value) {
 				if ( !$permissions_helper->isOldPermission($section_name, $perm_name) ) {
 					$perm_name = $section_name . '.' . $perm_name;
 				}
 
 				$db_perm_value = $permissions_helper->getPermissionValue($perm_name);
 
 				if ( $db_perm_value == 1 && $perm_value == 0 ) {
 					// permission was disabled => delete it's record
 					$delete_ids[] = $permissions_helper->getPermissionID($perm_name);
 				}
 				elseif ( $db_perm_value == 0 && $perm_value == 1 ) {
 					// permission was enabled => created it's record
 					$create_sql[$perm_name] = sprintf($create_mask, $new_id--, $this->Conn->qstr($perm_name), $this->Conn->qstr($perm_value));
 				}
 				// permission state was not changed in all other cases
 			}
 		}
 
 		$this->UpdatePermissions($event, $create_sql, Array (), $delete_ids);
 
 		if ( $this->Application->GetVar('advanced_save') == 1 ) {
 			// advanced permission popup [save button]
 			$this->finalizePopup($event);
 //			$event->redirect = 'incs/just_close';
 		}
 		elseif ( $this->Application->GetVar('section_name') != '' ) {
 			// save simple permissions before opening advanced permission popup
 			$event->redirect = false;
 		}
 	}
 
 	/**
 	 * Apply modification sqls to permissions table
 	 *
 	 * @param kEvent $event
 	 * @param Array $create_sql
 	 * @param Array $update_sql
 	 * @param Array $delete_ids
 	 */
 	function UpdatePermissions($event, $create_sql, $update_sql, $delete_ids)
 	{
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		if ($delete_ids) {
 			$action = ChangeLog::DELETE;
 			$object->Load($delete_ids[count($delete_ids) - 1]);
 
 			$delete_sql = '	DELETE FROM '.$object->TableName.'
 							WHERE '.$object->IDField.' IN ('.implode(',', $delete_ids).')';
 			$this->Conn->Query($delete_sql);
 		}
 
 		if ($create_sql) {
 			$create_sql = '	INSERT INTO '.$object->TableName.'
 							VALUES '.implode(',', $create_sql);
 			$this->Conn->Query($create_sql);
 
 			$sql = 'SELECT MIN(' . $object->IDField . ')
 					FROM ' . $object->TableName;
 			$id = $this->Conn->GetOne($sql);
 
 			$action = ChangeLog::CREATE;
 			$object->Load($id);
 		}
 
 		if ($update_sql) {
 			foreach ($update_sql as $id => $sql) {
 				$this->Conn->Query($sql);
 			}
 
 			$action = ChangeLog::UPDATE;
 			$object->Load($id);
 			$object->SetDBField('PermissionValue', $object->GetDBField('PermissionValue') ? 0 : 1);
 		}
 
 		if ($delete_ids || $create_sql || $update_sql) {
 			$object->setModifiedFlag($action);
 
 			if ($event->Name == 'OnCategorySavePermissions') {
 				$this->Application->StoreVar('PermCache_UpdateRequired', 1);
 			}
 		}
 	}
 
 	/**
 	 * Don't delete permissions from live table in case of new category creation.
 	 * Called as much times as permission count for categories set, so don't
 	 * perform any sql queries here!
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnBeforeDeleteFromLive(kEvent $event)
 	{
 		parent::OnBeforeDeleteFromLive($event);
 
 		if ( $event->Prefix == 'c-perm' ) {
 			// only when saving category permissions, not group permissions
 			$foreign_keys = $event->getEventParam('foreign_key');
 
 			if ( (count($foreign_keys) == 1) && ($foreign_keys[0] == 0) ) {
 				// parent item has zero id
+				/** @var CategoriesItem $temp_object */
 				$temp_object = $this->Application->recallObject('c');
-				/* @var $temp_object CategoriesItem */
 
 				if ( $temp_object->isLoaded() ) {
 					// category with id = 0 found in temp table
 					$event->status = kEvent::erFAIL;
 				}
 			}
 		}
 	}
 
 }
Index: branches/5.3.x/core/units/permissions/permissions_tag_processor.php
===================================================================
--- branches/5.3.x/core/units/permissions/permissions_tag_processor.php	(revision 16518)
+++ branches/5.3.x/core/units/permissions/permissions_tag_processor.php	(revision 16519)
@@ -1,225 +1,225 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class PermissionsTagProcessor extends kDBTagProcessor {
 
 		function HasPermission($params)
 		{
 			$section_name = $params['section_name'];
 
+			/** @var kSectionsHelper $sections_helper */
 			$sections_helper = $this->Application->recallObject('SectionsHelper');
-			/* @var $sections_helper kSectionsHelper */
 
 			$section_data =& $sections_helper->getSectionData($section_name);
 
 			return array_search($params['perm_name'], $section_data['permissions']) !== false;
 		}
 
 		function HasAdvancedPermissions($params)
 		{
 			$section_name = $params['section_name'];
 
+			/** @var kSectionsHelper $sections_helper */
 			$sections_helper = $this->Application->recallObject('SectionsHelper');
-			/* @var $sections_helper kSectionsHelper */
 
 			$section_data =& $sections_helper->getSectionData($section_name);
 
 			$ret = false;
 			foreach ($section_data['permissions'] as $perm_name) {
 				if (preg_match('/^advanced:(.*)/', $perm_name)) {
 					$ret = true;
 					break;
 				}
 			}
 			return $ret;
 		}
 
 		function PermissionValue($params)
 		{
 			$section_name = $params['section_name'];
 			$perm_name = $params['perm_name'];
 
+			/** @var kSectionsHelper $sections_helper */
 			$sections_helper = $this->Application->recallObject('SectionsHelper');
-			/* @var $sections_helper kSectionsHelper */
 
 			$section_name = $sections_helper->getPermSection($section_name);
 
+			/** @var kPermissionsHelper $permissions_helper */
 			$permissions_helper = $this->Application->recallObject('PermissionsHelper');
-			/* @var $permissions_helper kPermissionsHelper */
 
 			if (!$permissions_helper->isOldPermission($section_name, $perm_name)) {
 				$perm_name = $section_name.'.'.$perm_name;
 			}
 
 			return $permissions_helper->getPermissionValue($perm_name);
 		}
 
 		function LoadPermissions($params)
 		{
 			$permissions_helper = $this->Application->recallObject('PermissionsHelper');
 			$prefix_parts = explode('-', $this->Prefix, 2);
-			/* @var $permissions_helper kPermissionsHelper */
+			/** @var kPermissionsHelper $permissions_helper */
 
 			$permissions_helper->LoadPermissions($this->Application->GetVar('g_id'), 0, 1, 'g');
 		}
 
 		function LevelIndicator($params)
 		{
 			return $params['level'] * $params['multiply'];
 		}
 
 		function PrintPermissions($params)
 		{
+			/** @var kDBItem $category */
 			$category = $this->Application->recallObject('c');
-			/* @var $category kDBItem */
 
 			$group_id = $this->Application->GetVar('group_id');
 			$prefix = $this->Application->GetVar('item_prefix');
 			$module = $this->Application->findModule('Var', $prefix, 'Name');
 
 			$perm_live_table = $this->Application->getUnitConfig('c-perm')->getTableName();
 			$perm_temp_table = $this->Application->GetTempName($perm_live_table, 'prefix:'.$this->Prefix);
 
 			if ($category->GetID() == 0) {
 				$categories = Array(0);
 			}
 			else {
 				$categories = explode('|', substr($category->GetDBField('ParentPath'), 1, -1));
 			}
 
 			if (count($categories) == 1 || $category->GetID() == 0) {
 				// category located in root category ("Home") => then add it to path virtually
 				array_unshift($categories, 0);
 			}
 			$this_cat = array_pop($categories);
 
 			// get permission name + category position in parent path that has value set for that permission
 			$case = 'MAX(CASE p.CatId';
 			foreach ($categories as $pos => $cat_id) {
 				$case .= ' WHEN '.$cat_id.' THEN '.$pos;
 			}
 			$case .= ' END) AS InheritedPosition';
 
 			$sql = 'SELECT '.$case.', p.Permission AS Perm
 					FROM '.$perm_live_table.' p
 					LEFT JOIN '.TABLE_PREFIX.'CategoryPermissionsConfig pc ON pc.PermissionName = p.Permission
 					WHERE
 						p.CatId IN ('.implode(',', $categories).') AND
 						pc.ModuleId = ' . $this->Conn->qstr($module) . ' AND
 						(
 							(p.GroupId = ' . (int)$group_id . ' AND p.Type = 0)
 						)
 					GROUP BY Perm';
 			$perm_positions = $this->Conn->GetCol($sql, 'Perm');
 
 			$pos_sql = '';
 			foreach ($perm_positions as $perm_name => $category_pos) {
 				$pos_sql .= '(#TABLE_PREFIX#.Permission = "'.$perm_name.'" AND #TABLE_PREFIX#.CatId = '.$categories[$category_pos].') OR ';
 			}
 			$pos_sql = $pos_sql ? substr($pos_sql, 0, -4) : '0';
 
 			// get all permissions list with iheritence status, inherited category id and permission value
 			$sql = 'SELECT 	pc.PermissionName,
 							pc.Description,
 							IF (tmp_p.PermissionValue IS NULL AND p.PermissionValue IS NULL,
 								0,
 								IF (tmp_p.PermissionValue IS NOT NULL, tmp_p.PermissionValue, p.PermissionValue)
 							) AS Value,
 							IF (tmp_p.CatId IS NOT NULL, tmp_p.CatId, IF(p.CatId IS NOT NULL, p.CatId, 0) ) AS InheritedFrom,
 							IF(tmp_p.CatId = '.$category->GetID().', 0, 1) AS Inherited,
 							IF(p.PermissionValue IS NOT NULL, p.PermissionValue, 0) AS InheritedValue
 					FROM '.TABLE_PREFIX.'CategoryPermissionsConfig pc
 					LEFT JOIN '.$perm_live_table.' p
 					ON (p.Permission = pc.PermissionName) AND ('.str_replace('#TABLE_PREFIX#', 'p', $pos_sql).') AND (p.GroupId = '.(int)$group_id.')
 					LEFT JOIN '.$perm_temp_table.' tmp_p
 					ON (tmp_p.Permission = pc.PermissionName) AND (tmp_p.CatId = '.$this_cat.') AND (tmp_p.GroupId = '.$group_id.')
 					WHERE ModuleId = "'.$module.'"';
 			$permissions = $this->Conn->Query($sql);
 
 			$ret = '';
 			$block_params = $this->prepareTagParams($params);
 			$block_params['name'] = $params['render_as'];
 
 			foreach ($permissions as $perm_record) {
 				$block_params = array_merge($block_params, $perm_record);
 				$ret .= $this->Application->ParseBlock($block_params);
 			}
 
 			return $ret;
 		}
 
 		/**
 		 * Print module tab for each module
 		 *
 		 * @param Array $params
 		 * @return string
 		 */
 		function PrintTabs($params)
 		{
 			$ret = '';
 			$block_params = $params;
 			foreach ($this->Application->ModuleInfo as $module_name => $module_data) {
 				if (!$this->Application->prefixRegistred($module_data['Var']) || !$this->Application->getUnitConfig($module_data['Var'])->getCatalogItem()) continue;
 				$params['item_prefix'] = $module_data['Var'];
 				$ret .= $this->Application->IncludeTemplate($params);
 			}
 
 			return $ret;
 		}
 
 		/**
 		 * Returns category name by ID
 		 *
 		 * @param Array $params
 		 * @return string
 		 * @access protected
 		 */
 		protected function CategoryPath($params)
 		{
 			$category_id = $params['cat_id'];
 			$cache_key = 'category_paths[%CIDSerial:' . $category_id . '%][%PhrasesSerial%][Adm:' . (int)$this->Application->isAdmin . ']';
 			$category_path = $this->Application->getCache($cache_key);
 
 			if ( $category_path === false ) {
 				// not cached
 				if ( $category_id > 0 ) {
+					/** @var kMultiLanguage $ml_formatter */
 					$ml_formatter = $this->Application->recallObject('kMultiLanguage');
-					/* @var $ml_formatter kMultiLanguage */
 
 					$categories_config = $this->Application->getUnitConfig('c');
 
 					$sql = 'SELECT ' . $ml_formatter->LangFieldName('CachedNavbar') . '
 							FROM ' . $categories_config->getTableName() . '
 							WHERE ' . $categories_config->getIDField() . ' = ' . $category_id;
 					$cached_navbar = preg_replace('/^Content(&\|&){0,1}/i', '', $this->Conn->GetOne($sql));
 					$category_path = trim($this->CategoryPath(Array ('cat_id' => 0)) . ' > ' . str_replace('&|&', ' > ', $cached_navbar), ' > ');
 				}
 				else {
 					$category_path = $this->Application->Phrase(($this->Application->isAdmin ? 'la_' : 'lu_') . 'rootcategory_name');
 				}
 
 				$this->Application->setCache($cache_key, $category_path);
 			}
 
 			return $category_path;
 		}
 
 		function PermInputName($params)
 		{
 			 return $this->Prefix.'['.$this->Application->GetVar('group_id').']['.$this->Application->Parser->GetParam('PermissionName').']['.$params['sub_key'].']';
 		}
 
 	}
Index: branches/5.3.x/core/units/stylesheets/stylesheets_event_handler.php
===================================================================
--- branches/5.3.x/core/units/stylesheets/stylesheets_event_handler.php	(revision 16518)
+++ branches/5.3.x/core/units/stylesheets/stylesheets_event_handler.php	(revision 16519)
@@ -1,44 +1,44 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class StylesheetsEventHandler extends kDBEventHandler {
 
 	/**
 	 * [HOOK] Compile stylesheet file based on theme definitions
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnCompileStylesheet($event)
 	{
+		/** @var StylesheetsItem $object */
 		$object = $event->getObject( Array ('skip_autoload' => true) );
-		/* @var $object StylesheetsItem */
 
 		$object->SwitchToLive();
 
 		$ids = explode(',', $event->MasterEvent->getEventParam('ids'));
 
 		if ( !$ids ) {
 			return ;
 		}
 
 		foreach ($ids as $id) {
 			$object->Load($id);
 			$object->Compile();
 		}
 	}
 }
\ No newline at end of file
Index: branches/5.3.x/core/units/stylesheets/stylesheets_item.php
===================================================================
--- branches/5.3.x/core/units/stylesheets/stylesheets_item.php	(revision 16518)
+++ branches/5.3.x/core/units/stylesheets/stylesheets_item.php	(revision 16519)
@@ -1,64 +1,64 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class StylesheetsItem extends kDBItem
 	{
 
 		function Compile()
 		{
+			/** @var SelectorsItem $selector_item */
 			$selector_item = $this->Application->recallObject('selectors.item', 'selectors', Array('live_table'=>true, 'skip_autoload' => true) );
-			/* @var $selector_item SelectorsItem */
 
 			$parent_field = $selector_item->getUnitConfig()->getForeignKey();
 
 			$sql_template = 'SELECT '.$selector_item->IDField.' FROM '.$selector_item->TableName.' WHERE '.$parent_field.' = %s ORDER BY SelectorName ASC';
 
 			$selectors_ids = $this->Conn->GetCol( sprintf($sql_template, $this->GetID() ) );
 			$ret = '/* This file is generated automatically. Don\'t edit it manually ! */'."\n\n";
 
 			foreach($selectors_ids as $selector_id)
 			{
 				$selector_item->Load($selector_id);
 				$ret .= $selector_item->CompileStyle()."\n";
 			}
 
 			$ret .= $this->GetDBField('AdvancedCSS');
 
 			$compile_ts = time();
 			$css_path = WRITEABLE . '/stylesheets/';
 
+			/** @var FileHelper $file_helper */
 			$file_helper = $this->Application->recallObject('FileHelper');
-			/* @var $file_helper FileHelper */
 
 			$file_helper->CheckFolder($css_path);
 
 			$css_file = $css_path.mb_strtolower($this->GetDBField('Name')).'-'.$compile_ts.'.css';
 
 			$fp = fopen($css_file,'w');
 			if($fp)
 			{
 				$prev_css = $css_path.mb_strtolower($this->GetDBField('Name')).'-'.$this->GetDBField('LastCompiled').'.css';
 				if( file_exists($prev_css) ) unlink($prev_css);
 
 				fwrite($fp, $ret);
 				fclose($fp);
 
 				$sql = 'UPDATE '.$this->TableName.' SET LastCompiled = '.$compile_ts.' WHERE '.$this->IDField.' = '.$this->GetID();
 				$this->Conn->Query($sql);
 			}
 		}
 
 	}
\ No newline at end of file
Index: branches/5.3.x/core/units/page_revisions/page_revision_tp.php
===================================================================
--- branches/5.3.x/core/units/page_revisions/page_revision_tp.php	(revision 16518)
+++ branches/5.3.x/core/units/page_revisions/page_revision_tp.php	(revision 16519)
@@ -1,29 +1,29 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class PageRevisionTagProcessor extends kDBTagProcessor {
 
 	function LastAutoSaveAgo($params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
+		/** @var PageHelper $page_helper */
 		$page_helper = $this->Application->recallObject('PageHelper');
-		/* @var $page_helper PageHelper */
 
 		return $page_helper->getAgoTime( $object->GetDBField('AutoSavedOn') );
 	}
 }
Index: branches/5.3.x/core/units/page_revisions/page_revision_eh.php
===================================================================
--- branches/5.3.x/core/units/page_revisions/page_revision_eh.php	(revision 16518)
+++ branches/5.3.x/core/units/page_revisions/page_revision_eh.php	(revision 16519)
@@ -1,377 +1,377 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class PageRevisionEventHandler extends kDBEventHandler {
 
 	/**
 	 * Checks permissions of user
 	 *
 	 * @param kEvent $event
 	 * @return bool
 	 * @access public
 	 */
 	public function CheckPermission(kEvent $event)
 	{
 		if ( $event->Name == 'OnItemBuild' ) {
 			return true;
 		}
 
 		if ( $event->Name == 'OnGetInfo' || $event->Name == 'OnDiscard' ) {
 			return $this->Application->isAdminUser;
 		}
 
+		/** @var kPermissionsHelper $perm_helper */
 		$perm_helper = $this->Application->recallObject('PermissionsHelper');
-		/* @var $perm_helper kPermissionsHelper */
 
 		if ( $event->Name == 'OnSave' ) {
 				$perm_status = $this->Application->CheckPermission('CATEGORY.REVISION.ADD', 0) || $this->Application->CheckPermission('CATEGORY.REVISION.ADD.PENDING', 0);
 
 			return $perm_helper->finalizePermissionCheck($event, $perm_status);
 		}
 
 		if ( $event->Name == 'OnPublish' || $event->Name == 'OnDecline' ) {
 			$perm_status = $this->Application->CheckPermission('CATEGORY.REVISION.MODERATE', 0);
 
 			return $perm_helper->finalizePermissionCheck($event, $perm_status);
 		}
 
 		return parent::CheckPermission($event);
 	}
 
 	/**
 	 * Lists all current page revisions
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function SetCustomQuery(kEvent $event)
 	{
 		parent::SetCustomQuery($event);
 
+		/** @var kDBList $object */
 		$object = $event->getObject();
-		/* @var $object kDBList */
 
 		$page_id = $event->getEventParam('page_id');
 
 		if ( $this->Application->isAdmin ) {
 			$user_id = $this->Application->RecallVar('user_id');
 		}
 		else {
 			$user_id = $this->Application->RecallVar('admin_user_id');
 		}
 
 		$object->addFilter('draft_filter', 'IF(%1$s.IsDraft = 1, %1$s.CreatedById = ' . $user_id . ', TRUE)');
 
 		if ( $page_id !== false ) {
 			$object->addFilter('parent_filter', '%1$s.PageId = ' . $page_id);
 		}
 	}
 
 	/**
 	 * Returns current page revision
 	 *
 	 * @param kEvent $event
 	 * @return int
 	 * @access public
 	 */
 	public function getPassedID(kEvent $event)
 	{
 		if ( $event->Special == 'current' ) {
+			/** @var kDBItem $page */
 			$page = $this->Application->recallObject('st.-virtual');
-			/* @var $page kDBItem */
 
+			/** @var PageHelper $page_helper */
 			$page_helper = $this->Application->recallObject('PageHelper');
-			/* @var $page_helper PageHelper */
 
 			$page_id = $page->GetID();
 			$revision_clause = $page_helper->getRevsionWhereClause($page_id, $page->GetDBField('LiveRevisionNumber'));
 
 			$sql = 'SELECT RevisionId
 					FROM ' . TABLE_PREFIX . 'PageRevisions
 					WHERE (PageId = ' . $page_id . ') AND (' . $revision_clause . ')
 					ORDER BY IsDraft DESC, RevisionNumber DESC';
 			$id = $this->Conn->GetOne($sql);
 
 			if ( $id ) {
 				return $id;
 			}
 
 			// no revisions -> create live revision
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$object->SetDBField('PageId', $page_id);
 			$object->SetDBField('RevisionNumber', 1);
 			$object->SetDBField('Status', STATUS_ACTIVE);
 			$object->Create();
 
 			return $object->GetID();
 		}
 
 		return parent::getPassedID($event);
 	}
 
 	/**
 	 * Remembers, who created revision
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnBeforeItemCreate(kEvent $event)
 	{
 		parent::OnBeforeItemCreate($event);
 
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		if ( $this->Application->isAdmin ) {
 			$object->SetDBField('CreatedById', $this->Application->RecallVar('user_id'));
 		}
 		else {
 			$object->SetDBField('CreatedById', $this->Application->RecallVar('admin_user_id'));
 		}
 	}
 
 	/**
 	 * Updates revision creation time
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnBeforeItemUpdate(kEvent $event)
 	{
 		parent::OnBeforeItemUpdate($event);
 
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		if ( $object->GetDBField('IsDraft') == 0 && $object->GetOriginalField('IsDraft') == 1 ) {
 			$object->SetDBField('CreatedOn_date', time());
 			$object->SetDBField('CreatedOn_time', time());
 		}
 	}
 
 	/**
 	 * Creates new content blocks based on source revision
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnAfterItemCreate(kEvent $event)
 	{
 		parent::OnAfterItemCreate($event);
 
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		if ( !$object->GetDBField('FromRevisionId') ) {
 			return ;
 		}
 
+		/** @var kDBItem $content */
 		$content = $this->Application->recallObject('content.-item', null, Array ('skip_autoload' => true));
-		/* @var $content kDBItem */
 
 		$sql = 	$content->GetSelectSQL() . '
 				WHERE pr.RevisionId = ' . $object->GetDBField('FromRevisionId');
 		$content_blocks = $this->Conn->Query($sql);
 
 		foreach ($content_blocks as $content_block) {
 			$content->LoadFromHash($content_block);
 			$content->SetDBField('RevisionId', $object->GetID());
 			$content->Create();
 		}
 	}
 
 	/**
 	 * Mark revision as current, once it's approved
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnAfterItemUpdate(kEvent $event)
 	{
 		parent::OnAfterItemUpdate($event);
 
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		$status = $object->GetDBField('Status');
 
 		if ( $status != $object->GetOriginalField('Status') && $status == STATUS_ACTIVE ) {
+			/** @var kDBItem $page */
 			$page = $this->Application->recallObject('c.revision', null, Array ('skip_autoload' => true));
-			/* @var $page kDBItem */
 
 			$page->Load($object->GetDBField('PageId'));
 			$page->SetDBField('LiveRevisionNumber', $object->GetDBField('RevisionNumber'));
 			$page->Update();
 		}
 	}
 
 	/**
 	 * Returns user, who are editing current page right now
 	 *
 	 * @param kEvent $event
 	 */
 	function OnGetInfo($event)
 	{
 		$event->status = kEvent::erSTOP;
 
 		if ( $this->Application->GetVar('ajax') != 'yes' ) {
 			return ;
 		}
 
+		/** @var PageHelper $page_helper */
 		$page_helper = $this->Application->recallObject('PageHelper');
-		/* @var $page_helper PageHelper */
 
 		$page_id = $this->Application->GetVar('m_cat_id');
 		echo json_encode( $page_helper->getPageInfo($page_id) );
 	}
 
 	/**
 	 * Saves user draft into live revision
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnSave(kEvent $event)
 	{
 		$revision_id = $this->getCurrentDraftRevision($event);
 
 		if ( $revision_id ) {
+			/** @var kDBItem $object */
 			$object = $event->getObject(Array ('skip_autoload' => true));
-			/* @var $object kDBItem */
 
 			$object->Load($revision_id);
 			$object->SetDBField('IsDraft', 0);
 			$object->SetDBField('RevisionNumber', $this->getNextAvailableRevision($event));
 
 			if ( $this->Application->CheckPermission('CATEGORY.REVISION.ADD', 0) ) {
 				$object->SetDBField('Status', STATUS_ACTIVE);
 			}
 			elseif ( $this->Application->CheckPermission('CATEGORY.REVISION.ADD.PENDING', 0) ) {
 				$object->SetDBField('Status', STATUS_PENDING);
 			}
 
 			$object->Update();
 		}
 
 		$event->SetRedirectParam('opener', 'u');
 	}
 
 	/**
 	 * Discards user draft
 	 *
 	 * @param kEvent $event
 	 */
 	function OnDiscard($event)
 	{
 		$revision_id = $this->getCurrentDraftRevision($event);
 
 		if ( $revision_id ) {
+			/** @var kTempTablesHandler $temp_handler */
 			$temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
-			/* @var $temp_handler kTempTablesHandler */
 
 			$temp_handler->DeleteItems($event->Prefix, $event->Special, Array ($revision_id));
 		}
 
 		$event->SetRedirectParam('opener', 'u');
 	}
 
 	/**
 	 * Makes revision live
 	 *
 	 * @param kEvent $event
 	 */
 	function OnPublish($event)
 	{
+		/** @var kDBItem $revision */
 		$revision = $this->Application->recallObject('page-revision.current');
-		/* @var $revision kDBItem */
 
 		if ( !$revision->isLoaded() || $revision->GetDBField('Status') == STATUS_ACTIVE || $revision->GetDBField('IsDraft') ) {
 			return ;
 		}
 
 		$revision->SetDBField('Status', STATUS_ACTIVE);
 		$revision->Update();
 
 		$event->SetRedirectParam('opener', 'u');
 	}
 
 	/**
 	 * Denies changes made in revision
 	 *
 	 * @param kEvent $event
 	 */
 	function OnDecline($event)
 	{
+		/** @var kDBItem $revision */
 		$revision = $this->Application->recallObject('page-revision.current');
-		/* @var $revision kDBItem */
 
 		if ( !$revision->isLoaded() || $revision->GetDBField('Status') == STATUS_DISABLED || $revision->GetDBField('IsLive') || $revision->GetDBField('IsDraft') ) {
 			return ;
 		}
 
 		$revision->SetDBField('Status', STATUS_DISABLED);
 		$revision->Update();
 
 		$event->SetRedirectParam('opener', 'u');
 	}
 
 	/**
 	 * Returns revision id of user's draft
 	 *
 	 * @param kEvent $event
 	 * @return int
 	 */
 	function getCurrentDraftRevision($event)
 	{
 		$where_clause = Array (
 			'IsDraft = 1',
 			'PageId = ' . $this->Application->GetVar('m_cat_id'),
 			'CreatedById = ' . $this->Application->RecallVar('user_id'),
 		);
 
 		$config = $event->getUnitConfig();
 
 		$sql = 'SELECT ' . $config->getIDField() . '
 				FROM ' . $config->getTableName() . '
 				WHERE (' . implode(') AND (', $where_clause) . ')';
 
 		return $this->Conn->GetOne($sql);
 	}
 
 	/**
 	 * Returns next available revision number for current page
 	 *
 	 * @param kEvent $event
 	 * @return int
 	 */
 	function getNextAvailableRevision($event)
 	{
 		$sql = 'SELECT MAX(RevisionNumber)
 				FROM ' . $event->getUnitConfig()->getTableName() . '
 				WHERE PageId = ' . $this->Application->GetVar('m_cat_id');
 		$max_revision = (int)$this->Conn->GetOne($sql);
 
 		return $max_revision + 1;
 	}
 }
Index: branches/5.3.x/core/units/site_domains/site_domain_eh.php
===================================================================
--- branches/5.3.x/core/units/site_domains/site_domain_eh.php	(revision 16518)
+++ branches/5.3.x/core/units/site_domains/site_domain_eh.php	(revision 16519)
@@ -1,324 +1,324 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2010 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class SiteDomainEventHandler extends kDBEventHandler {
 
 		/**
 		 * Checks user permission to execute given $event
 		 *
 		 * @param kEvent $event
 		 * @return bool
 		 * @access public
 		 */
 		public function CheckPermission(kEvent $event)
 		{
 			if ( $event->Name == 'OnItemBuild' ) {
 				// check permission without using $event->getSection(),
 				// so first cache rebuild won't lead to "ldefault_Name" field being used
 				return true;
 			}
 
 			return parent::CheckPermission($event);
 		}
 
 		/**
 		 * Returns ID of site domain, that matches current url
 		 *
 		 * @param kEvent $event
 		 * @return int
 		 * @access public
 		 */
 		public function getPassedID(kEvent $event)
 		{
 			if ( $event->Special == 'current' ) {
 				if ( $this->Application->isAdmin ) {
 					$event->setEventParam('raise_warnings', 0);
 				}
 				else {
 					$domain_field = PROTOCOL == 'https://' ? 'SSLDomainName' : 'DomainName';
 
 					return $this->querySiteDomain($domain_field, $_SERVER['HTTP_HOST']);
 				}
 			}
 
 			return parent::getPassedID($event);
 		}
 
 		function querySiteDomain($field, $value)
 		{
+			/** @var SiteHelper $site_helper */
 			$site_helper = $this->Application->recallObject('SiteHelper');
-			/* @var $site_helper SiteHelper */
 
 			$site_domains = $site_helper->getSiteDomains();
 			$domain_by_name = $site_helper->getDomainByName($field, $value);
 			$domain_by_ip = $site_helper->getDomainByIP();
 
 			if ($domain_by_ip) {
 				$site_domain = $site_domains[$domain_by_ip];
 				$redirect_mode = $site_domain['RedirectOnIPMatch'];
 
 				if (($redirect_mode == SITE_DOMAIN_REDIRECT_EXTERNAL) && ($domain_by_ip == $domain_by_name)) {
 					// redirect to external url (when visiting protected domain)
 					$external_url = $site_domain['ExternalUrl'];
 
 					if (preg_match('/^http[s]{0,1}:\/\//', $external_url)) {
 						$this->Application->Redirect('external:' . $external_url);
 					}
 					else {
 						$this->Application->Redirect('external:' . PROTOCOL . $external_url . $_SERVER['REQUEST_URI']);
 					}
 				}
 				elseif (($redirect_mode == SITE_DOMAIN_REDIRECT_CURRENT) && ($domain_by_ip != $domain_by_name)) {
 					// redirect to a domain detected by IP (when not already on it)
 					if ((PROTOCOL == 'https://') && !$site_domain['SSLDomainNameUsesRegExp'] && $site_domain['SSLDomainName']) {
 						$this->Application->Redirect('external:https://' . $site_domain['SSLDomainName'] . $_SERVER['REQUEST_URI']);
 					}
 					elseif ((PROTOCOL == 'http://') && !$site_domain['DomainNameUsesRegExp']) {
 						$this->Application->Redirect('external:http://' . $site_domain['DomainName'] . $_SERVER['REQUEST_URI']);
 					}
 				}
 
 				return $domain_by_ip;
 			}
 
 			return $domain_by_name;
 		}
 
 		/**
 		 * Load item if id is available
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function LoadItem(kEvent $event)
 		{
 			if ( $this->Application->isAdmin ) {
 				// don't load domain data from cache
 				parent::LoadItem($event);
 
 				return;
 			}
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$id = (int)$this->getPassedID($event);
 
 			if ( $object->isLoaded() && ($object->GetID() == $id) ) {
 				// object is already loaded by same id
 				return;
 			}
 
+			/** @var SiteHelper $site_helper */
 			$site_helper = $this->Application->recallObject('SiteHelper');
-			/* @var $site_helper SiteHelper */
 
 			$site_domains = $site_helper->getSiteDomains();
 			$domain_data = array_key_exists($id, $site_domains) ? $site_domains[$id] : false;
 
 			if ( $object->LoadFromHash($domain_data) ) {
+				/** @var Params $actions */
 				$actions = $this->Application->recallObject('kActions');
-				/* @var $actions Params */
 
 				$actions->Set($event->getPrefixSpecial() . '_id', $object->GetID());
 			}
 			else {
 				$object->setID($id);
 			}
 		}
 
 		/**
 		 * Removes In-Commerce related fields, when it's not installed
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterConfigRead(kEvent $event)
 		{
 			parent::OnAfterConfigRead($event);
 
 			if (!$this->Application->isModuleEnabled('In-Commerce')) {
 				$remove_fields = Array (
 					'BillingCountry', 'ShippingCountry',
 					'PrimaryCurrencyId', 'Currencies',
 					'PrimaryPaymentTypeId', 'PaymentTypes'
 				);
 
 				$config = $event->getUnitConfig();
 
 				// remove field definitions
 				$fields = $config->getFields();
 
 				foreach ($remove_fields as $remove_field) {
 					unset($fields[$remove_field]);
 				}
 
 				$config->setFields($fields);
 
 				// remove grid columns
 				$grids = $config->getGrids(Array ());
 
 				foreach ($grids as $grid_name => $grid_info) {
 					foreach ($remove_fields as $remove_field) {
 						if (array_key_exists($remove_field, $grid_info['Fields'])) {
 							unset($grids[$grid_name]['Fields'][$remove_field]);
 						}
 					}
 				}
 
 				$config->setGrids($grids);
 			}
 		}
 
 		/**
 		 * Delete cached information about site domains
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnSave(kEvent $event)
 		{
 			parent::OnSave($event);
 
 			if ( $event->status == kEvent::erSUCCESS ) {
 				$this->_deleteCache();
 			}
 		}
 
 		/**
 		 * Deletes cached information about site domains
 		 */
 		function _deleteCache()
 		{
 			if ( $this->Application->isCachingType(CACHING_TYPE_MEMORY) ) {
 				$this->Application->rebuildCache('master:domains_parsed', kCache::REBUILD_LATER, CacheSettings::$domainsParsedRebuildTime);
 			}
 			else {
 				$this->Application->rebuildDBCache('domains_parsed', kCache::REBUILD_LATER, CacheSettings::$domainsParsedRebuildTime);
 			}
 
 			$sql = 'DELETE FROM ' . TABLE_PREFIX . 'CachedUrls';
 			$this->Conn->Query($sql);
 		}
 
 		/**
 		 * Sets required fields based on redirect mode
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemLoad(kEvent $event)
 		{
 			parent::OnAfterItemLoad($event);
 
 			$this->_setRequired($event);
 		}
 
 		/**
 		 * Set's required fields based on redirect mode
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemCreate(kEvent $event)
 		{
 			parent::OnBeforeItemCreate($event);
 
 			$this->_itemChanged($event);
 		}
 
 		/**
 		 * Set's required fields based on redirect mode
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemUpdate(kEvent $event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
 			$this->_itemChanged($event);
 		}
 
 		/**
 		 * Deletes site domain cache.
 		 *
 		 * @param kEvent $event Event.
 		 *
 		 * @return void
 		 */
 		protected function OnAfterItemUpdate(kEvent $event)
 		{
 			parent::OnAfterItemUpdate($event);
 
 			/** @var kDBItem $object */
 			$object = $event->getObject();
 
 			if ( !$object->IsTempTable() ) {
 				$this->_deleteCache();
 			}
 		}
 
 		/**
 		 * Deletes site domain cache
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnAfterItemDelete(kEvent $event)
 		{
 			parent::OnAfterItemDelete($event);
 
 			$this->_deleteCache();
 		}
 
 		/**
 		 * Occurs before item is changed
 		 *
 		 * @param kEvent $event
 		 */
 		function _itemChanged($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$email_event_data = $this->Application->GetVar('email-template_' . $event->Prefix);
 			$object->SetDBField('DefaultEmailRecipients', $email_event_data[0]['Recipients']);
 
 			$this->_setRequired($event);
 		}
 
 		/**
 		 * Set's required fields
 		 *
 		 * @param kEvent $event
 		 */
 		function _setRequired($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$redirect_mode = $object->GetDBField('RedirectOnIPMatch');
 			$object->setRequired('ExternalUrl', $redirect_mode == SITE_DOMAIN_REDIRECT_EXTERNAL);
 			$object->setRequired('DomainIPRange', $redirect_mode > 0);
 		}
 	}
Index: branches/5.3.x/core/units/spam_reports/spam_report_tp.php
===================================================================
--- branches/5.3.x/core/units/spam_reports/spam_report_tp.php	(revision 16518)
+++ branches/5.3.x/core/units/spam_reports/spam_report_tp.php	(revision 16519)
@@ -1,88 +1,88 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class SpamReportTagProcessor extends kDBTagProcessor {
 
 	/**
 	 * Returns a link for editing ad/user
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function ItemEditLink($params)
 	{
+		/** @var kDBList $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBList */
 
 		$prefix = $object->GetDBField('ItemPrefix');
 
 		$url_params = Array (
 			'm_opener'			=>	'd',
 			$prefix.'_mode'		=>	't',
 			$prefix.'_event'	=>	'OnEdit',
 			$prefix.'_id'		=>	$object->GetDBField('ItemId'),
 			'pass'				=>	'all,'.$prefix,
 		);
 
 		if ( $this->IsReviewReport($params) ) {
 			$edit_template = 'reviews/review_direct_edit';
 			$url_params['pass_through'] = 'item_prefix';
 			$url_params['item_prefix'] = $prefix;
 		}
 		else {
 			$edit_template = '';
 		}
 
 		return $this->Application->HREF($edit_template,'', $url_params);
 	}
 
 	/**
 	 * Builds a link, to delete item, associated with this spam report
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function AssocItemDeleteLink($params)
 	{
+		/** @var kDBList $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBList */
 
 		$prefix = $this->getPrefixSpecial();
 
 		$url_params = Array (
 			$prefix . '_event'	=>	'OnDeleteAssocItem',
 			$prefix . '_id'		=>	$object->GetID(),
 			'pass'				=>	'm,'.$prefix,
 		);
 
 		return $this->Application->HREF('','', $url_params);
 	}
 
 	/**
 	 * Checks, that it's review report
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function IsReviewReport($params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		return preg_match('/rev$/',  $object->GetDBField('ItemPrefix'));
 	}
 }
\ No newline at end of file
Index: branches/5.3.x/core/units/spam_reports/spam_report_eh.php
===================================================================
--- branches/5.3.x/core/units/spam_reports/spam_report_eh.php	(revision 16518)
+++ branches/5.3.x/core/units/spam_reports/spam_report_eh.php	(revision 16519)
@@ -1,147 +1,147 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class SpamReportEventHandler extends kDBEventHandler {
 
 	/**
 	 * Allows to override standard permission mapping
 	 *
 	 * @return void
 	 * @access protected
 	 * @see kEventHandler::$permMapping
 	 */
 	protected function mapPermissions()
 	{
 		parent::mapPermissions();
 
 		$permissions = Array (
 			'OnNewReport' => Array ('self' => true),
 			'OnDeleteAssocItem' => Array ('self' => 'delete'),
 		);
 
 		$this->permMapping = array_merge($this->permMapping, $permissions);
 	}
 
 	/**
 	 * Checks permissions
 	 *
 	 * @param kEvent $event
 	 */
 //	function CheckPermission($event)
 //	{
 //		if ( $event->Name == 'OnNewReport' ) {
 //			$perm_helper = $this->Application->recallObject('PermissionsHelper');
 //			/* @var $perm_helper kPermissionsHelper */
 //
 //			return $perm_helper->finalizePermissionCheck($event, $this->Application->LoggedIn());
 //		}
 //
 //		return parent::CheckPermission($event);
 //	}
 
 	/**
 	 * Prefills missing fields
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnBeforeItemCreate(kEvent $event)
 	{
 		parent::OnBeforeItemCreate($event);
 
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		$item_prefix = $this->Application->GetVar('item_prefix');
 		$item_id = $this->Application->GetVar($item_prefix . '_id');
 
 		if ( $item_id ) {
 			$object->SetDBField('ItemPrefix', $item_prefix);
 			$object->SetDBField('ItemId', $item_id);
 		}
 
 		$object->SetDBField('ReportedById', $this->Application->RecallVar('user_id'));
 	}
 
 	/**
 	 * Send e-mail after new spam report was created
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnAfterItemCreate(kEvent $event)
 	{
 		parent::OnAfterItemCreate($event);
 
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		$item_prefix = $object->GetDBField('ItemPrefix');
 
 		if ( preg_match('/rev$/', $item_prefix) ) {
+			/** @var kDBItem $item */
 			$item = $this->Application->recallObject($item_prefix);
-			/* @var $item kDBItem */
 
 			$object->SetDBField('ItemName', $item->GetDBField('ReviewText'));
 		}
 
 		$this->Application->emailAdmin('SPAM.REPORT', null, $object->getEmailParams());
 	}
 
 	/**
 	 * Sends new spam report
 	 *
 	 * @param kEvent $event
 	 */
 	function OnNewReport($event)
 	{
+		/** @var AjaxFormHelper $ajax_form_helper */
 		$ajax_form_helper = $this->Application->recallObject('AjaxFormHelper');
-		/* @var $ajax_form_helper AjaxFormHelper */
 
 		$ajax_form_helper->transitEvent($event, 'OnCreate');
 	}
 
 	/**
 	 * Deletes item, associated with given spam report
 	 *
 	 * @param kEvent $event
 	 */
 	function OnDeleteAssocItem($event)
 	{
 		$temp_handlers = Array ();
 		$ids = $this->StoreSelectedIDs($event);
 
+		/** @var kDBItem $object */
 		$object = $event->getObject( Array ('skip_autoload' => true) );
-		/* @var $object kDBItem */
 
 		foreach ($ids as $id) {
 			$object->Load($id);
 			$item_prefix = $object->GetDBField('ItemPrefix');
 
 			if ( !isset($temp_handlers[$item_prefix]) ) {
 				$temp_handlers[$item_prefix] = $this->Application->recallObject($item_prefix . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
 			}
 
 			$temp_handlers[$item_prefix]->DeleteItems($item_prefix, '', Array ($object->GetDBField('ItemId')));
 		}
 
 		$this->clearSelectedIDs($event);
 
 		$event->SetRedirectParam('opener', 'u');
 	}
 }
\ No newline at end of file
Index: branches/5.3.x/core/install/upgrades.php
===================================================================
--- branches/5.3.x/core/install/upgrades.php	(revision 16518)
+++ branches/5.3.x/core/install/upgrades.php	(revision 16519)
@@ -1,2545 +1,2545 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	$upgrade_class = 'CoreUpgrades';
 
 	/**
 	 * Class, that holds all upgrade scripts for "Core" module
 	 *
 	 */
 	class CoreUpgrades extends kUpgradeHelper {
 
 		/**
 		 * Tables, that were renamed during 5.2.0 version upgrade
 		 *
 		 * @var Array
 		 * @access private
 		 */
 		private $renamedTables = Array (
 			'ban-rule' => Array ('from' => 'BanRules', 'to' => 'UserBanRules'),
 			'conf' => Array ('from' => 'ConfigurationValues', 'to' => 'SystemSettings'),
 			'c' => Array ('from' => 'Category', 'to' => 'Categories'),
 			'cf' => Array ('from' => 'CustomField', 'to' => 'CustomFields'),
 			'draft' => Array ('from' => 'Drafts', 'to' => 'FormSubmissionReplyDrafts'),
 			'email-template' => Array ('from' => 'Events', 'to' => 'EmailEvents'),
 			'fav' => Array ('from' => 'Favorites', 'to' => 'UserFavorites'),
 			'img' => Array ('from' => 'Images', 'to' => 'CatalogImages'),
 			'#file' => Array ('from' => 'ItemFiles', 'to' => 'CatalogFiles'),
 			'rev' => Array ('from' => 'ItemReview', 'to' => 'CatalogReviews'),
 			'lang' => Array ('from' => 'Language', 'to' => 'Languages'),
 			'permission-type' => Array ('from' => 'PermissionConfig', 'to' => 'CategoryPermissionsConfig'),
 			'phrases' => Array ('from' => 'Phrase', 'to' => 'LanguageLabels'),
 			'g' => Array ('from' => 'PortalGroup', 'to' => 'UserGroups'),
 			'user-profile' => Array ('from' => 'PersistantSessionData', 'to' => 'UserPersistentSessionData'),
 			'u' => Array ('from' => 'PortalUser', 'to' => 'Users'),
 			'u-cdata' => Array ('from' => 'PortalUserCustomData', 'to' => 'UserCustomData'),
 			'search' => Array ('from' => 'RelatedSearches', 'to' => 'CategoryRelatedSearches'),
 			'rel' => Array ('from' => 'Relationship', 'to' => 'CatalogRelationships'),
 			'search-log' => Array ('from' => 'SearchLog', 'to' => 'SearchLogs'),
 			'skin' => Array ('from' => 'Skins', 'to' => 'AdminSkins'),
 			'submission-log' => Array ('from' => 'SubmissionLog', 'to' => 'FormSubmissionReplies'),
 			'theme' => Array ('from' => 'Theme', 'to' => 'Themes'),
 			'ug' => Array ('from' => 'UserGroup', 'to' => 'UserGroupRelations'),
 			'visits' => Array ('from' => 'Visits', 'to' => 'UserVisits'),
 			'session-log' => Array ('from' => 'SessionLogs', 'to' => 'UserSessionLogs'),
 		);
 
 		/**
 		 * Changes table structure, where multilingual fields of TEXT type are present
 		 *
 		 * @param string $mode when called mode {before, after)
 		 */
 		function Upgrade_4_1_0($mode)
 		{
 			if ($mode == 'before') {
 				// don't user after, because In-Portal calls this method too
 				$this->_toolkit->SaveConfig();
 			}
 
 			if ($mode == 'after') {
+				/** @var kMultiLanguageHelper $ml_helper */
 				$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
-				/* @var $ml_helper kMultiLanguageHelper */
 
 				$languages = $ml_helper->getLanguages();
 				$this->Application->UnitConfigReader->ReReadConfigs();
 
 				foreach ($this->Application->UnitConfigReader->getPrefixes() as $prefix) {
 					$this->updateTextFields($prefix, $languages);
 				}
 			}
 		}
 
 		/**
 		 * Moves ReplacementTags functionality from EmailMessage to Events table
 		 *
 		 * @param string $mode when called mode {before, after)
 		 */
 		function Upgrade_4_1_1($mode)
 		{
 			if ($mode == 'after') {
 				$sql = 'SELECT ReplacementTags, EventId
 						FROM '.TABLE_PREFIX.'EmailMessage
 						WHERE (ReplacementTags IS NOT NULL) AND (ReplacementTags <> "") AND (LanguageId = 1)';
 				$replacement_tags = $this->Conn->GetCol($sql, 'EventId');
 
 				foreach ($replacement_tags as $event_id => $replacement_tag) {
 					$sql = 'UPDATE '.TABLE_PREFIX.'Events
 							SET ReplacementTags = '.$this->Conn->qstr($replacement_tag).'
 							WHERE EventId = '.$event_id;
 					$this->Conn->Query($sql);
 				}
 
 				// drop moved field from source table
 				$sql = 'ALTER TABLE '.TABLE_PREFIX.'EmailMessage
 						DROP `ReplacementTags`';
 				$this->Conn->Query($sql);
 			}
 		}
 
 		/**
 		 * Callback function, that makes all ml fields of text type null with same default value
 		 *
 		 * @param string $prefix
 		 * @param Array $languages
 		 *
 		 * @return boolean
 		 */
 		function updateTextFields($prefix, $languages)
 		{
 			$config = $this->Application->getUnitConfig($prefix);
 
 			if ( $config->getTableName() === false || $config->getFields() === false ) {
 				// invalid config found or prefix not found
 				return false;
 			}
 
 			$table_name = $config->getTableName();
 			$table_structure = $this->Conn->Query('DESCRIBE ' . $table_name, 'Field');
 
 			if ( !$table_structure ) {
 				// table not found
 				return false;
 			}
 
 			$sqls = Array();
 
 			foreach ( $config->getFields() as $field => $options ) {
 				if ( isset($options['formatter']) && $options['formatter'] == 'kMultiLanguage' && !isset($options['master_field']) ) {
 					// update all l<lang_id>_<field_name> fields (new format)
 
 					foreach ( $languages as $language_id ) {
 						$ml_field = 'l' . $language_id . '_' . $field;
 
 						if ( $table_structure[$ml_field]['Type'] == 'text' ) {
 							$sqls[] = 'CHANGE ' . $ml_field . ' ' . $ml_field . ' TEXT NULL DEFAULT NULL';
 						}
 					}
 
 					// update <field_name> if found (old format)
 					if ( isset($table_structure[$field]) && $table_structure[$field]['Type'] == 'text' ) {
 						$sqls[] = 'CHANGE ' . $field . ' ' . $field . ' TEXT NULL DEFAULT NULL';
 					}
 				}
 			}
 
 			if ( $sqls ) {
 				$sql = 'ALTER TABLE ' . $table_name . ' ' . implode(', ', $sqls);
 				$this->Conn->Query($sql);
 			}
 
 			return true;
 		}
 
 		/**
 		 * Replaces In-Portal tags in Forgot Password related email events to K4 ones
 		 *
 		 * @param string $mode when called mode {before, after)
 		 */
 		function Upgrade_4_2_0($mode)
 		{
 			if ($mode == 'after') {
 				// 1. get event ids based on their name and type combination
 				$event_names = Array (
 					'USER.PSWD_' . EmailTemplate::TEMPLATE_TYPE_ADMIN,
 					'USER.PSWD_' . EmailTemplate::TEMPLATE_TYPE_FRONTEND,
 					'USER.PSWDC_' . EmailTemplate::TEMPLATE_TYPE_FRONTEND,
 				);
 
 				$event_sql = Array ();
 				foreach ($event_names as $mixed_event) {
 					list ($event_name, $event_type) = explode('_', $mixed_event, 2);
 					$event_sql[] = 'Event = "'.$event_name.'" AND Type = '.$event_type;
 				}
 
 				$sql = 'SELECT EventId
 						FROM '.TABLE_PREFIX.'Events
 						WHERE ('.implode(') OR (', $event_sql).')';
 				$event_ids = implode(',', $this->Conn->GetCol($sql));
 
 				// 2. replace In-Portal tags to K4 tags
 				$replacements = Array (
 					'<inp:touser _Field="Password" />' => '<inp2:u_ForgottenPassword />',
 					'<inp:m_confirm_password_link />' => '<inp2:u_ConfirmPasswordLink no_amp="1"/>',
 				);
 
 				foreach ($replacements as $old_tag => $new_tag) {
 					$sql = 'UPDATE '.TABLE_PREFIX.'EmailMessage
 							SET Template = REPLACE(Template, '.$this->Conn->qstr($old_tag).', '.$this->Conn->qstr($new_tag).')
 							WHERE EventId IN ('.$event_ids.')';
 					$this->Conn->Query($sql);
 				}
 
 			}
 		}
 
 		/**
 		 * Makes admin primary language same as front-end - not needed, done in SQL
 		 *
 		 * @param string $mode when called mode {before, after)
 		 */
 		function Upgrade_4_2_1($mode)
 		{
 
 		}
 
 		function Upgrade_4_2_2($mode)
 		{
 			if ( $mode == 'before' ) {
 				$sql = 'SELECT LanguageId
 						FROM ' . TABLE_PREFIX . 'Language
 						WHERE PrimaryLang = 1';
 
 				if ( $this->Conn->GetOne($sql) ) {
 					return;
 				}
 
 				$this->Conn->Query('UPDATE ' . TABLE_PREFIX . 'Language SET PrimaryLang = 1 ORDER BY LanguageId LIMIT 1');
 			}
 		}
 
 		/**
 		 * Adds index to "dob" field in "PortalUser" table when it's missing
 		 *
 		 * @param string $mode when called mode {before, after)
 		 */
 		function Upgrade_4_3_1($mode)
 		{
 			if ($mode == 'after') {
 				$sql = 'DESCRIBE ' . TABLE_PREFIX . 'PortalUser';
 				$structure = $this->Conn->Query($sql);
 
 				foreach ($structure as $field_info) {
 					if ($field_info['Field'] == 'dob') {
 						if (!$field_info['Key']) {
 							$sql = 'ALTER TABLE ' . TABLE_PREFIX . 'PortalUser
 									ADD INDEX (dob)';
 							$this->Conn->Query($sql);
 						}
 						break;
 					}
 				}
 			}
 		}
 
 		/**
 		 * Removes duplicate phrases, update file paths in database
 		 *
 		 * @param string $mode when called mode {before, after)
 		 */
 		function Upgrade_4_3_9($mode)
 		{
 			// 1. find In-Portal old <inp: tags
 			$sql = 'SELECT EmailMessageId
 					FROM '.TABLE_PREFIX.'EmailMessage
 					WHERE Template LIKE \'%<inp:%\'';
 			$event_ids = implode(',', $this->Conn->GetCol($sql));
 
 			// 2. replace In-Portal old <inp: tags to K4 tags
 			$replacements = Array (
 				'<inp:m_category_field _Field="Name" _StripHTML="1"' => '<inp2:c_Field name="Name"',
 				'<inp:touser _Field="password"' => '<inp2:u_Field name="Password_plain"',
 				'<inp:touser _Field="UserName"' => '<inp2:u_Field name="Login"',
 				'<inp:touser _Field="' => '<inp2:u_Field name="',
 				'<inp:m_page_title' => '<inp2:m_BaseUrl',
 				'<inp:m_theme_url _page="current"' => '<inp2:m_BaseUrl',
 				'<inp:topic _field="text"' => '<inp2:bb-post_Field name="PostingText"',
 				'<inp:topic _field="link" _Template="inbulletin/post_list"' => '<inp2:bb_TopicLink template="__default__"',
 			);
 
 			if ($event_ids) {
 				foreach ($replacements as $old_tag => $new_tag) {
 					$sql = 'UPDATE '.TABLE_PREFIX.'EmailMessage
 							SET Template = REPLACE(Template, '.$this->Conn->qstr($old_tag).', '.$this->Conn->qstr($new_tag).')
 							WHERE EventId IN ('.$event_ids.')';
 					$this->Conn->Query($sql);
 				}
 			}
 
 			if ($mode == 'after') {
 				$this->_insertInPortalData();
 				$this->_moveDatabaseFolders();
 
 				// in case, when In-Portal module is enabled -> turn AdvancedUserManagement on too
 				if ($this->Application->findModule('Name', 'In-Portal')) {
 					$sql = 'UPDATE ' . TABLE_PREFIX . 'ConfigurationValues
 							SET VariableValue = 1
 							WHERE VariableName = "AdvancedUserManagement"';
 					$this->Conn->Query($sql);
 				}
 			}
 
 			if ($mode == 'languagepack') {
 				$this->_removeDuplicatePhrases();
 			}
 		}
 
 		function _insertInPortalData()
 		{
 			$data = Array (
 				'ConfigurationAdmin' => Array (
 					'UniqueField' => 'VariableName',
 					'Records' => Array (
 						'AllowDeleteRootCats' => "('AllowDeleteRootCats', 'la_Text_General', 'la_AllowDeleteRootCats', 'checkbox', NULL , NULL , 10.09, 0, 0)",
 						'Catalog_PreselectModuleTab' => "('Catalog_PreselectModuleTab', 'la_Text_General', 'la_config_CatalogPreselectModuleTab', 'checkbox', NULL, NULL, 10.10, 0, 1)",
 						'RecycleBinFolder' => "('RecycleBinFolder', 'la_Text_General', 'la_config_RecycleBinFolder', 'text', NULL , NULL , 10.11, 0, 0)",
 						'AdvancedUserManagement' => "('AdvancedUserManagement', 'la_Text_General', 'la_prompt_AdvancedUserManagement', 'checkbox', NULL, NULL, '10.011', 0, 1)",
 					),
 				),
 
 				'ConfigurationValues' => Array (
 					'UniqueField' => 'VariableName',
 					'Records' => Array (
 						'AdvancedUserManagement' => "(DEFAULT, 'AdvancedUserManagement', 0, 'In-Portal:Users', 'in-portal:configure_users')",
 					),
 				),
 
 				'ItemTypes' => Array (
 					'UniqueField' => 'ItemType',
 					'Records' => Array (
 						'1' => "(1, 'In-Portal', 'c', 'Category', 'Name', 'CreatedById', NULL, NULL, 'la_ItemTab_Categories', 1, 'admin/category/addcategory.php', 'clsCategory', 'Category')",
 						'6' => "(6, 'In-Portal', 'u', 'PortalUser', 'Login', 'PortalUserId', NULL, NULL, '', 0, '', 'clsPortalUser', 'User')",
 					),
 				),
 
 				'PermissionConfig' => Array (
 					'UniqueField' => 'PermissionName',
 					'Records' => Array (
 						'CATEGORY.ADD' => "(DEFAULT, 'CATEGORY.ADD', 'lu_PermName_Category.Add_desc', 'lu_PermName_Category.Add_error', 'In-Portal')",
 						'CATEGORY.DELETE' => "(DEFAULT, 'CATEGORY.DELETE', 'lu_PermName_Category.Delete_desc', 'lu_PermName_Category.Delete_error', 'In-Portal')",
 						'CATEGORY.ADD.PENDING' => "(DEFAULT, 'CATEGORY.ADD.PENDING', 'lu_PermName_Category.AddPending_desc', 'lu_PermName_Category.AddPending_error', 'In-Portal')",
 						'CATEGORY.MODIFY' => "(DEFAULT, 'CATEGORY.MODIFY', 'lu_PermName_Category.Modify_desc', 'lu_PermName_Category.Modify_error', 'In-Portal')",
 						'ADMIN' => "(DEFAULT, 'ADMIN', 'lu_PermName_Admin_desc', 'lu_PermName_Admin_error', 'Admin')",
 						'LOGIN' => "(DEFAULT, 'LOGIN', 'lu_PermName_Login_desc', 'lu_PermName_Admin_error', 'Front')",
 						'DEBUG.ITEM' => "(DEFAULT, 'DEBUG.ITEM', 'lu_PermName_Debug.Item_desc', '', 'Admin')",
 						'DEBUG.LIST' => "(DEFAULT, 'DEBUG.LIST', 'lu_PermName_Debug.List_desc', '', 'Admin')",
 						'DEBUG.INFO' => "(DEFAULT, 'DEBUG.INFO', 'lu_PermName_Debug.Info_desc', '', 'Admin')",
 						'PROFILE.MODIFY' => "(DEFAULT, 'PROFILE.MODIFY', 'lu_PermName_Profile.Modify_desc', '', 'Admin')",
 						'SHOWLANG' => "(DEFAULT, 'SHOWLANG', 'lu_PermName_ShowLang_desc', '', 'Admin')",
 						'FAVORITES' => "(DEFAULT, 'FAVORITES', 'lu_PermName_favorites_desc', 'lu_PermName_favorites_error', 'In-Portal')",
 						'SYSTEM_ACCESS.READONLY' => "(DEFAULT, 'SYSTEM_ACCESS.READONLY', 'la_PermName_SystemAccess.ReadOnly_desc', 'la_PermName_SystemAccess.ReadOnly_error', 'Admin')",
 					),
 				),
 
 				'Permissions' => Array (
 					'UniqueField' => 'Permission;GroupId;Type;CatId',
 					'Records' => Array (
 						'LOGIN;12;1;0' => "(DEFAULT, 'LOGIN', 12, 1, 1, 0)",
 						'in-portal:site.view;11;1;0' => "(DEFAULT, 'in-portal:site.view', 11, 1, 1, 0)",
 						'in-portal:browse.view;11;1;0' => "(DEFAULT, 'in-portal:browse.view', 11, 1, 1, 0)",
 						'in-portal:advanced_view.view;11;1;0' => "(DEFAULT, 'in-portal:advanced_view.view', 11, 1, 1, 0)",
 						'in-portal:reviews.view;11;1;0' => "(DEFAULT, 'in-portal:reviews.view', 11, 1, 1, 0)",
 						'in-portal:configure_categories.view;11;1;0' => "(DEFAULT, 'in-portal:configure_categories.view', 11, 1, 1, 0)",
 						'in-portal:configure_categories.edit;11;1;0' => "(DEFAULT, 'in-portal:configure_categories.edit', 11, 1, 1, 0)",
 						'in-portal:configuration_search.view;11;1;0' => "(DEFAULT, 'in-portal:configuration_search.view', 11, 1, 1, 0)",
 						'in-portal:configuration_search.edit;11;1;0' => "(DEFAULT, 'in-portal:configuration_search.edit', 11, 1, 1, 0)",
 						'in-portal:configuration_email.view;11;1;0' => "(DEFAULT, 'in-portal:configuration_email.view', 11, 1, 1, 0)",
 						'in-portal:configuration_email.edit;11;1;0' => "(DEFAULT, 'in-portal:configuration_email.edit', 11, 1, 1, 0)",
 						'in-portal:configuration_custom.view;11;1;0' => "(DEFAULT, 'in-portal:configuration_custom.view', 11, 1, 1, 0)",
 						'in-portal:configuration_custom.add;11;1;0' => "(DEFAULT, 'in-portal:configuration_custom.add', 11, 1, 1, 0)",
 						'in-portal:configuration_custom.edit;11;1;0' => "(DEFAULT, 'in-portal:configuration_custom.edit', 11, 1, 1, 0)",
 						'in-portal:configuration_custom.delete;11;1;0' => "(DEFAULT, 'in-portal:configuration_custom.delete', 11, 1, 1, 0)",
 						'in-portal:users.view;11;1;0' => "(DEFAULT, 'in-portal:users.view', 11, 1, 1, 0)",
 						'in-portal:user_list.advanced:ban;11;1;0' => "(DEFAULT, 'in-portal:user_list.advanced:ban', 11, 1, 1, 0)",
 						'in-portal:user_list.advanced:send_email;11;1;0' => "(DEFAULT, 'in-portal:user_list.advanced:send_email', 11, 1, 1, 0)",
 						'in-portal:user_groups.view;11;1;0' => "(DEFAULT, 'in-portal:user_groups.view', 11, 1, 1, 0)",
 						'in-portal:user_groups.add;11;1;0' => "(DEFAULT, 'in-portal:user_groups.add', 11, 1, 1, 0)",
 						'in-portal:user_groups.edit;11;1;0' => "(DEFAULT, 'in-portal:user_groups.edit', 11, 1, 1, 0)",
 						'in-portal:user_groups.delete;11;1;0' => "(DEFAULT, 'in-portal:user_groups.delete', 11, 1, 1, 0)",
 						'in-portal:user_groups.advanced:send_email;11;1;0' => "(DEFAULT, 'in-portal:user_groups.advanced:send_email', 11, 1, 1, 0)",
 						'in-portal:user_groups.advanced:manage_permissions;11;1;0' => "(DEFAULT, 'in-portal:user_groups.advanced:manage_permissions', 11, 1, 1, 0)",
 						'in-portal:configure_users.view;11;1;0' => "(DEFAULT, 'in-portal:configure_users.view', 11, 1, 1, 0)",
 						'in-portal:configure_users.edit;11;1;0' => "(DEFAULT, 'in-portal:configure_users.edit', 11, 1, 1, 0)",
 						'in-portal:user_email.view;11;1;0' => "(DEFAULT, 'in-portal:user_email.view', 11, 1, 1, 0)",
 						'in-portal:user_email.edit;11;1;0' => "(DEFAULT, 'in-portal:user_email.edit', 11, 1, 1, 0)",
 						'in-portal:user_custom.view;11;1;0' => "(DEFAULT, 'in-portal:user_custom.view', 11, 1, 1, 0)",
 						'in-portal:user_custom.add;11;1;0' => "(DEFAULT, 'in-portal:user_custom.add', 11, 1, 1, 0)",
 						'in-portal:user_custom.edit;11;1;0' => "(DEFAULT, 'in-portal:user_custom.edit', 11, 1, 1, 0)",
 						'in-portal:user_custom.delete;11;1;0' => "(DEFAULT, 'in-portal:user_custom.delete', 11, 1, 1, 0)",
 						'in-portal:user_banlist.view;11;1;0' => "(DEFAULT, 'in-portal:user_banlist.view', 11, 1, 1, 0)",
 						'in-portal:user_banlist.add;11;1;0' => "(DEFAULT, 'in-portal:user_banlist.add', 11, 1, 1, 0)",
 						'in-portal:user_banlist.edit;11;1;0' => "(DEFAULT, 'in-portal:user_banlist.edit', 11, 1, 1, 0)",
 						'in-portal:user_banlist.delete;11;1;0' => "(DEFAULT, 'in-portal:user_banlist.delete', 11, 1, 1, 0)",
 						'in-portal:reports.view;11;1;0' => "(DEFAULT, 'in-portal:reports.view', 11, 1, 1, 0)",
 						'in-portal:log_summary.view;11;1;0' => "(DEFAULT, 'in-portal:log_summary.view', 11, 1, 1, 0)",
 						'in-portal:searchlog.view;11;1;0' => "(DEFAULT, 'in-portal:searchlog.view', 11, 1, 1, 0)",
 						'in-portal:searchlog.delete;11;1;0' => "(DEFAULT, 'in-portal:searchlog.delete', 11, 1, 1, 0)",
 						'in-portal:sessionlog.view;11;1;0' => "(DEFAULT, 'in-portal:sessionlog.view', 11, 1, 1, 0)",
 						'in-portal:sessionlog.delete;11;1;0' => "(DEFAULT, 'in-portal:sessionlog.delete', 11, 1, 1, 0)",
 						'in-portal:emaillog.view;11;1;0' => "(DEFAULT, 'in-portal:emaillog.view', 11, 1, 1, 0)",
 						'in-portal:emaillog.delete;11;1;0' => "(DEFAULT, 'in-portal:emaillog.delete', 11, 1, 1, 0)",
 						'in-portal:visits.view;11;1;0' => "(DEFAULT, 'in-portal:visits.view', 11, 1, 1, 0)",
 						'in-portal:visits.delete;11;1;0' => "(DEFAULT, 'in-portal:visits.delete', 11, 1, 1, 0)",
 						'in-portal:configure_general.view;11;1;0' => "(DEFAULT, 'in-portal:configure_general.view', 11, 1, 1, 0)",
 						'in-portal:configure_general.edit;11;1;0' => "(DEFAULT, 'in-portal:configure_general.edit', 11, 1, 1, 0)",
 						'in-portal:modules.view;11;1;0' => "(DEFAULT, 'in-portal:modules.view', 11, 1, 1, 0)",
 						'in-portal:mod_status.view;11;1;0' => "(DEFAULT, 'in-portal:mod_status.view', 11, 1, 1, 0)",
 						'in-portal:mod_status.edit;11;1;0' => "(DEFAULT, 'in-portal:mod_status.edit', 11, 1, 1, 0)",
 						'in-portal:mod_status.advanced:approve;11;1;0' => "(DEFAULT, 'in-portal:mod_status.advanced:approve', 11, 1, 1, 0)",
 						'in-portal:mod_status.advanced:decline;11;1;0' => "(DEFAULT, 'in-portal:mod_status.advanced:decline', 11, 1, 1, 0)",
 						'in-portal:addmodule.view;11;1;0' => "(DEFAULT, 'in-portal:addmodule.view', 11, 1, 1, 0)",
 						'in-portal:addmodule.add;11;1;0' => "(DEFAULT, 'in-portal:addmodule.add', 11, 1, 1, 0)",
 						'in-portal:addmodule.edit;11;1;0' => "(DEFAULT, 'in-portal:addmodule.edit', 11, 1, 1, 0)",
 						'in-portal:tag_library.view;11;1;0' => "(DEFAULT, 'in-portal:tag_library.view', 11, 1, 1, 0)",
 						'in-portal:configure_themes.view;11;1;0' => "(DEFAULT, 'in-portal:configure_themes.view', 11, 1, 1, 0)",
 						'in-portal:configure_themes.add;11;1;0' => "(DEFAULT, 'in-portal:configure_themes.add', 11, 1, 1, 0)",
 						'in-portal:configure_themes.edit;11;1;0' => "(DEFAULT, 'in-portal:configure_themes.edit', 11, 1, 1, 0)",
 						'in-portal:configure_themes.delete;11;1;0' => "(DEFAULT, 'in-portal:configure_themes.delete', 11, 1, 1, 0)",
 						'in-portal:configure_styles.view;11;1;0' => "(DEFAULT, 'in-portal:configure_styles.view', 11, 1, 1, 0)",
 						'in-portal:configure_styles.add;11;1;0' => "(DEFAULT, 'in-portal:configure_styles.add', 11, 1, 1, 0)",
 						'in-portal:configure_styles.edit;11;1;0' => "(DEFAULT, 'in-portal:configure_styles.edit', 11, 1, 1, 0)",
 						'in-portal:configure_styles.delete;11;1;0' => "(DEFAULT, 'in-portal:configure_styles.delete', 11, 1, 1, 0)",
 						'in-portal:configure_lang.advanced:set_primary;11;1;0' => "(DEFAULT, 'in-portal:configure_lang.advanced:set_primary', 11, 1, 1, 0)",
 						'in-portal:configure_lang.advanced:import;11;1;0' => "(DEFAULT, 'in-portal:configure_lang.advanced:import', 11, 1, 1, 0)",
 						'in-portal:configure_lang.advanced:export;11;1;0' => "(DEFAULT, 'in-portal:configure_lang.advanced:export', 11, 1, 1, 0)",
 						'in-portal:tools.view;11;1;0' => "(DEFAULT, 'in-portal:tools.view', 11, 1, 1, 0)",
 						'in-portal:backup.view;11;1;0' => "(DEFAULT, 'in-portal:backup.view', 11, 1, 1, 0)",
 						'in-portal:restore.view;11;1;0' => "(DEFAULT, 'in-portal:restore.view', 11, 1, 1, 0)",
 						'in-portal:export.view;11;1;0' => "(DEFAULT, 'in-portal:export.view', 11, 1, 1, 0)",
 						'in-portal:main_import.view;11;1;0' => "(DEFAULT, 'in-portal:main_import.view', 11, 1, 1, 0)",
 						'in-portal:sql_query.view;11;1;0' => "(DEFAULT, 'in-portal:sql_query.view', 11, 1, 1, 0)",
 						'in-portal:sql_query.edit;11;1;0' => "(DEFAULT, 'in-portal:sql_query.edit', 11, 1, 1, 0)",
 						'in-portal:server_info.view;11;1;0' => "(DEFAULT, 'in-portal:server_info.view', 11, 1, 1, 0)",
 						'in-portal:help.view;11;1;0' => "(DEFAULT, 'in-portal:help.view', 11, 1, 1, 0)",
 					),
 				),
 
 				'SearchConfig' => Array (
 					'UniqueField' => 'TableName;FieldName;ModuleName',
 					'Records' => Array (
 						'Category;NewItem;In-Portal' => "('Category', 'NewItem', 0, 1, 'lu_fielddesc_category_newitem', 'lu_field_newitem', 'In-Portal', 'la_text_category', 18, DEFAULT, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, NULL)",
 						'Category;PopItem;In-Portal' => "('Category', 'PopItem', 0, 1, 'lu_fielddesc_category_popitem', 'lu_field_popitem', 'In-Portal', 'la_text_category', 19, DEFAULT, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, NULL)",
 						'Category;HotItem;In-Portal' => "('Category', 'HotItem', 0, 1, 'lu_fielddesc_category_hotitem', 'lu_field_hotitem', 'In-Portal', 'la_text_category', 17, DEFAULT, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, NULL)",
 						'Category;MetaDescription;In-Portal' => "('Category', 'MetaDescription', 0, 1, 'lu_fielddesc_category_metadescription', 'lu_field_metadescription', 'In-Portal', 'la_text_category', 16, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL)",
 						'Category;ParentPath;In-Portal' => "('Category', 'ParentPath', 0, 1, 'lu_fielddesc_category_parentpath', 'lu_field_parentpath', 'In-Portal', 'la_text_category', 15, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL)",
 						'Category;ResourceId;In-Portal' => "('Category', 'ResourceId', 0, 1, 'lu_fielddesc_category_resourceid', 'lu_field_resourceid', 'In-Portal', 'la_text_category', 14, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL)",
 						'Category;CreatedById;In-Portal' => "('Category', 'CreatedById', 0, 1, 'lu_fielddesc_category_createdbyid', 'lu_field_createdbyid', 'In-Portal', 'la_text_category', 13, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL)",
 						'Category;CachedNavbar;In-Portal' => "('Category', 'CachedNavbar', 0, 1, 'lu_fielddesc_category_cachednavbar', 'lu_field_cachednavbar', 'In-Portal', 'la_text_category', 12, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL)",
 						'Category;CachedDescendantCatsQty;In-Portal' => "('Category', 'CachedDescendantCatsQty', 0, 1, 'lu_fielddesc_category_cacheddescendantcatsqty', 'lu_field_cacheddescendantcatsqty', 'In-Portal', 'la_text_category', 11, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL)",
 						'Category;MetaKeywords;In-Portal' => "('Category', 'MetaKeywords', 0, 1, 'lu_fielddesc_category_metakeywords', 'lu_field_metakeywords', 'In-Portal', 'la_text_category', 10, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL)",
 						'Category;Priority;In-Portal' => "('Category', 'Priority', 0, 1, 'lu_fielddesc_category_priority', 'lu_field_priority', 'In-Portal', 'la_text_category', 9, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL)",
 						'Category;Status;In-Portal' => "('Category', 'Status', 0, 1, 'lu_fielddesc_category_status', 'lu_field_status', 'In-Portal', 'la_text_category', 7, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL)",
 						'Category;EditorsPick;In-Portal' => "('Category', 'EditorsPick', 0, 1, 'lu_fielddesc_category_editorspick', 'lu_field_editorspick', 'In-Portal', 'la_text_category', 6, DEFAULT, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, NULL)",
 						'Category;CreatedOn;In-Portal' => "('Category', 'CreatedOn', 0, 1, 'lu_fielddesc_category_createdon', 'lu_field_createdon', 'In-Portal', 'la_text_category', 5, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL)",
 						'Category;Description;In-Portal' => "('Category', 'Description', 1, 1, 'lu_fielddesc_category_description', 'lu_field_description', 'In-Portal', 'la_text_category', 4, DEFAULT, 2, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL)",
 						'Category;Name;In-Portal' => "('Category', 'Name', 1, 1, 'lu_fielddesc_category_name', 'lu_field_name', 'In-Portal', 'la_text_category', 3, DEFAULT, 2, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL)",
 						'Category;ParentId;In-Portal' => "('Category', 'ParentId', 0, 1, 'lu_fielddesc_category_parentid', 'lu_field_parentid', 'In-Portal', 'la_text_category', 2, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL)",
 						'Category;CategoryId;In-Portal' => "('Category', 'CategoryId', 0, 1, 'lu_fielddesc_category_categoryid', 'lu_field_categoryid', 'In-Portal', 'la_text_category', 0, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL)",
 						'Category;Modified;In-Portal' => "('Category', 'Modified', 0, 1, 'lu_fielddesc_category_modified', 'lu_field_modified', 'In-Portal', 'la_text_category', 20, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL)",
 						'Category;ModifiedById;In-Portal' => "('Category', 'ModifiedById', 0, 1, 'lu_fielddesc_category_modifiedbyid', 'lu_field_modifiedbyid', 'In-Portal', 'la_text_category', 21, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL)",
 
 						'PortalUser;PortalUserId;In-Portal' => "('PortalUser', 'PortalUserId', -1, 0, 'lu_fielddesc_user_portaluserid', 'lu_field_portaluserid', 'In-Portal', 'la_text_user', 0, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL)",
 						'PortalUser;Login;In-Portal' => "('PortalUser', 'Login', -1, 0, 'lu_fielddesc_user_login', 'lu_field_login', 'In-Portal', 'la_text_user', 1, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL)",
 						'PortalUser;Password;In-Portal' => "('PortalUser', 'Password', -1, 0, 'lu_fielddesc_user_password', 'lu_field_password', 'In-Portal', 'la_text_user', 2, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL)",
 						'PortalUser;tz;In-Portal' => "('PortalUser', 'tz', -1, 0, 'lu_fielddesc_user_tz', 'lu_field_tz', 'In-Portal', 'la_text_user', 17, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL)",
 						'PortalUser;dob;In-Portal' => "('PortalUser', 'dob', -1, 0, 'lu_fielddesc_user_dob', 'lu_field_dob', 'In-Portal', 'la_text_user', 16, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL)",
 						'PortalUser;Modified;In-Portal' => "('PortalUser', 'Modified', -1, 0, 'lu_fielddesc_user_modified', 'lu_field_modified', 'In-Portal', 'la_text_user', 15, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL)",
 						'PortalUser;Status;In-Portal' => "('PortalUser', 'Status', -1, 0, 'lu_fielddesc_user_status', 'lu_field_status', 'In-Portal', 'la_text_user', 14, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL)",
 						'PortalUser;ResourceId;In-Portal' => "('PortalUser', 'ResourceId', -1, 0, 'lu_fielddesc_user_resourceid', 'lu_field_resourceid', 'In-Portal', 'la_text_user', 13, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL)",
 						'PortalUser;Country;In-Portal' => "('PortalUser', 'Country', -1, 0, 'lu_fielddesc_user_country', 'lu_field_country', 'In-Portal', 'la_text_user', 12, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL)",
 						'PortalUser;Zip;In-Portal' => "('PortalUser', 'Zip', -1, 0, 'lu_fielddesc_user_zip', 'lu_field_zip', 'In-Portal', 'la_text_user', 11, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL)",
 						'PortalUser;State;In-Portal' => "('PortalUser', 'State', -1, 0, 'lu_fielddesc_user_state', 'lu_field_state', 'In-Portal', 'la_text_user', 10, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL)",
 						'PortalUser;City;In-Portal' => "('PortalUser', 'City', -1, 0, 'lu_fielddesc_user_city', 'lu_field_city', 'In-Portal', 'la_text_user', 9, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL)",
 						'PortalUser;Street;In-Portal' => "('PortalUser', 'Street', -1, 0, 'lu_fielddesc_user_street', 'lu_field_street', 'In-Portal', 'la_text_user', 8, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL)",
 						'PortalUser;Phone;In-Portal' => "('PortalUser', 'Phone', -1, 0, 'lu_fielddesc_user_phone', 'lu_field_phone', 'In-Portal', 'la_text_user', 7, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL)",
 						'PortalUser;CreatedOn;In-Portal' => "('PortalUser', 'CreatedOn', -1, 0, 'lu_fielddesc_user_createdon', 'lu_field_createdon', 'In-Portal', 'la_text_user', 6, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL)",
 						'PortalUser;Email;In-Portal' => "('PortalUser', 'Email', -1, 0, 'lu_fielddesc_user_email', 'lu_field_email', 'In-Portal', 'la_text_user', 5, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL)",
 						'PortalUser;LastName;In-Portal' => "('PortalUser', 'LastName', -1, 0, 'lu_fielddesc_user_lastname', 'lu_field_lastname', 'In-Portal', 'la_text_user', 4, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL)",
 						'PortalUser;FirstName;In-Portal' => "('PortalUser', 'FirstName', -1, 0, 'lu_fielddesc_user_firstname', 'lu_field_firstname', 'In-Portal', 'la_text_user', 3, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL)",
 					),
 				),
 
 				'StatItem' => Array (
 					'UniqueField' => 'Module;ListLabel',
 					'Records' => Array (
 						'In-Portal;la_prompt_ActiveCategories' => "(DEFAULT, 'In-Portal', 'SELECT count(*) FROM <%prefix%>Category WHERE Status=1 ', NULL, 'la_prompt_ActiveCategories', '0', '1')",
 						'In-Portal;la_prompt_ActiveUsers' => "(DEFAULT, 'In-Portal', 'SELECT count(*) FROM <%prefix%>PortalUser WHERE Status=1 ', NULL, 'la_prompt_ActiveUsers', '0', '1')",
 						'In-Portal;la_prompt_CurrentSessions' => "(DEFAULT, 'In-Portal', 'SELECT count(*) FROM <%prefix%>UserSession', NULL, 'la_prompt_CurrentSessions', '0', '1')",
 						'In-Portal;la_prompt_TotalCategories' => "(DEFAULT, 'In-Portal', 'SELECT COUNT(*) as CategoryCount FROM <%prefix%>Category', NULL, 'la_prompt_TotalCategories', 0, 2)",
 						'In-Portal;la_prompt_ActiveCategories' => "(DEFAULT, 'In-Portal', 'SELECT COUNT(*) AS ActiveCategories FROM <%prefix%>Category WHERE Status = 1', NULL, 'la_prompt_ActiveCategories', 0, 2)",
 						'In-Portal;la_prompt_PendingCategories' => "(DEFAULT, 'In-Portal', 'SELECT COUNT(*) AS PendingCategories FROM <%prefix%>Category WHERE Status = 2', NULL, 'la_prompt_PendingCategories', 0, 2)",
 						'In-Portal;la_prompt_DisabledCategories' => "(DEFAULT, 'In-Portal', 'SELECT COUNT(*) AS DisabledCategories FROM <%prefix%>Category WHERE Status = 0', NULL, 'la_prompt_DisabledCategories', 0, 2)",
 						'In-Portal;la_prompt_NewCategories' => "(DEFAULT, 'In-Portal', 'SELECT COUNT(*) AS NewCategories FROM <%prefix%>Category WHERE (NewItem = 1) OR ( (UNIX_TIMESTAMP() - CreatedOn) <= <%m:config name=\"Category_DaysNew\"%>*86400 AND (NewItem = 2) )', NULL, 'la_prompt_NewCategories', 0, 2)",
 						'In-Portal;la_prompt_CategoryEditorsPick' => "(DEFAULT, 'In-Portal', 'SELECT COUNT(*) FROM <%prefix%>Category WHERE EditorsPick = 1', NULL, 'la_prompt_CategoryEditorsPick', 0, 2)",
 						'In-Portal;la_prompt_NewestCategoryDate' => "(DEFAULT, 'In-Portal', 'SELECT <%m:post_format field=\"MAX(CreatedOn)\" type=\"date\"%> FROM <%prefix%>Category', NULL, 'la_prompt_NewestCategoryDate', 0, 2)",
 						'In-Portal;la_prompt_LastCategoryUpdate' => "(DEFAULT, 'In-Portal', 'SELECT <%m:post_format field=\"MAX(Modified)\" type=\"date\"%> FROM <%prefix%>Category', NULL, 'la_prompt_LastCategoryUpdate', 0, 2)",
 						'In-Portal;la_prompt_TopicsUsers' => "(DEFAULT, 'In-Portal', 'SELECT COUNT(*) AS TotalUsers FROM <%prefix%>PortalUser', NULL, 'la_prompt_TopicsUsers', 0, 2)",
 						'In-Portal;la_prompt_UsersActive' => "(DEFAULT, 'In-Portal', 'SELECT COUNT(*) AS ActiveUsers FROM <%prefix%>PortalUser WHERE Status = 1', NULL, 'la_prompt_UsersActive', 0, 2)",
 						'In-Portal;la_prompt_UsersPending' => "(DEFAULT, 'In-Portal', 'SELECT COUNT(*) AS PendingUsers FROM <%prefix%>PortalUser WHERE Status = 2', NULL, 'la_prompt_UsersPending', 0, 2)",
 						'In-Portal;la_prompt_UsersDisabled' => "(DEFAULT, 'In-Portal', 'SELECT COUNT(*) AS DisabledUsers FROM <%prefix%>PortalUser WHERE Status = 0', NULL, 'la_prompt_UsersDisabled', 0, 2)",
 						'In-Portal;la_prompt_NewestUserDate' => "(DEFAULT, 'In-Portal', 'SELECT <%m:post_format field=\"MAX(CreatedOn)\" type=\"date\"%> FROM <%prefix%>PortalUser', NULL, 'la_prompt_NewestUserDate', 0, 2)",
 						'In-Portal;la_prompt_UsersUniqueCountries' => "(DEFAULT, 'In-Portal', 'SELECT COUNT( DISTINCT LOWER( Country ) ) FROM <%prefix%>PortalUser WHERE LENGTH(Country) > 0', NULL, 'la_prompt_UsersUniqueCountries', 0, 2)",
 						'In-Portal;la_prompt_UsersUniqueStates' => "(DEFAULT, 'In-Portal', 'SELECT COUNT( DISTINCT LOWER( State ) ) FROM <%prefix%>PortalUser WHERE LENGTH(State) > 0', NULL, 'la_prompt_UsersUniqueStates', 0, 2)",
 						'In-Portal;la_prompt_TotalUserGroups' => "(DEFAULT, 'In-Portal', 'SELECT COUNT(*) AS TotalUserGroups FROM <%prefix%>PortalGroup', NULL, 'la_prompt_TotalUserGroups', 0, 2)",
 						'In-Portal;la_prompt_BannedUsers' => "(DEFAULT, 'In-Portal', 'SELECT COUNT(*) AS BannedUsers FROM <%prefix%>PortalUser WHERE IsBanned = 1', NULL, 'la_prompt_BannedUsers', 0, 2)",
 						'In-Portal;la_prompt_NonExpiredSessions' => "(DEFAULT, 'In-Portal', 'SELECT COUNT(*) AS NonExipedSessions FROM <%prefix%>UserSession WHERE Status = 1', NULL, 'la_prompt_NonExpiredSessions', 0, 2)",
 						'In-Portal;la_prompt_ThemeCount' => "(DEFAULT, 'In-Portal', 'SELECT COUNT(*) AS ThemeCount FROM <%prefix%>Theme', NULL, 'la_prompt_ThemeCount', 0, 2)",
 						'In-Portal;la_prompt_RegionsCount' => "(DEFAULT, 'In-Portal', 'SELECT COUNT(*) AS RegionsCount FROM <%prefix%>Language', NULL, 'la_prompt_RegionsCount', 0, 2)",
 						'In-Portal;la_prompt_TablesCount' => "(DEFAULT, 'In-Portal', '<%m:sql_action sql=\"SHOW+TABLES\" action=\"COUNT\" field=\"*\"%>', NULL, 'la_prompt_TablesCount', 0, 2)",
 						'In-Portal;la_prompt_RecordsCount' => "(DEFAULT, 'In-Portal', '<%m:sql_action sql=\"SHOW+TABLE+STATUS\" action=\"SUM\" field=\"Rows\"%>', NULL, 'la_prompt_RecordsCount', 0, 2)",
 						'In-Portal;la_prompt_SystemFileSize' => "(DEFAULT, 'In-Portal', '<%m:custom_action sql=\"empty\" action=\"SysFileSize\"%>', NULL, 'la_prompt_SystemFileSize', 0, 2)",
 						'In-Portal;la_prompt_DataSize' => "(DEFAULT, 'In-Portal', '<%m:sql_action sql=\"SHOW+TABLE+STATUS\" action=\"SUM\" format_as=\"file\" field=\"Data_length\"%>', NULL, 'la_prompt_DataSize', 0, 2)",
 					),
 				),
 
 				'StylesheetSelectors' => Array (
 					'UniqueField' => 'SelectorId',
 					'Records' => Array (
 						'169' => "(169, 8, 'Calendar''s selected days', '.calendar tbody .selected', 'a:0:{}', '', 1, 'font-weight: bold;\\\r\\nbackground-color: #9ED7ED;\\r\\nborder: 1px solid #83B2C5;', 0)",
 						'118' => "(118, 8, 'Data grid row', 'td.block-data-row', 'a:0:{}', '', 2, 'border-bottom: 1px solid #cccccc;', 48)",
 						'81' => "(81, 8, '\"More\" link', 'a.link-more', 'a:0:{}', '', 2, 'text-decoration: underline;', 64)",
 						'88' => "(88, 8, 'Block data, separated rows', 'td.block-data-grid', 'a:0:{}', '', 2, 'border: 1px solid #cccccc;', 48)",
 						'42' => "(42, 8, 'Block Header', 'td.block-header', 'a:4:{s:5:\"color\";s:16:\"rgb(0, 159, 240)\";s:9:\"font-size\";s:4:\"20px\";s:11:\"font-weight\";s:6:\"normal\";s:7:\"padding\";s:3:\"5px\";}', 'Block Header', 1, 'font-family: Verdana, Helvetica, sans-serif;', 0)",
 						'76' => "(76, 8, 'Navigation bar menu', 'tr.head-nav td', 'a:0:{}', '', 1, 'vertical-align: middle;', 0)",
 						'48' => "(48, 8, 'Block data', 'td.block-data', 'a:2:{s:9:\"font-size\";s:5:\"12px;\";s:7:\"padding\";s:3:\"5px\";}', '', 1, '', 0)",
 						'78' => "(78, 8, 'Body main style', 'body', 'a:0:{}', '', 1, 'padding: 0px; \\r\\nbackground-color: #ffffff; \\r\\nfont-family: arial, verdana, helvetica; \\r\\nfont-size: small;\\r\\nwidth: auto;\\r\\nmargin: 0px;', 0)",
 						'58' => "(58, 8, 'Main table', 'table.main-table', 'a:0:{}', '', 1, 'width: 770px;\\r\\nmargin: 0px;\\r\\n/*table-layout: fixed;*/', 0)",
 						'79' => "(79, 8, 'Block: header of data block', 'span.block-data-grid-header', 'a:0:{}', '', 1, 'font-family: Arial, Helvetica, sans-serif;\\r\\ncolor: #009DF6;\\r\\nfont-size: 12px;\\r\\nfont-weight: bold;\\r\\nbackground-color: #E6EEFF;\\r\\npadding: 6px;\\r\\nwhite-space: nowrap;', 0)",
 						'64' => "(64, 8, 'Link', 'a', 'a:0:{}', '', 1, '', 0)",
 						'46' => "(46, 8, 'Product title link', 'a.link-product1', 'a:0:{}', 'Product title link', 1, 'color: #62A1DE;\\r\\nfont-size: 14px;\\r\\nfont-weight: bold;\\r\\nline-height: 20px;\\r\\npadding-bottom: 10px;', 0)",
 						'75' => "(75, 8, 'Copy of Main path link', 'table.main-path td a:hover', 'a:0:{}', '', 1, 'color: #ffffff;', 0)",
 						'160' => "(160, 8, 'Current item in navigation bar', '.checkout-step-current', 'a:0:{}', '', 1, 'color: #A20303;\\r\\nfont-weight: bold;', 0)",
 						'51' => "(51, 8, 'Right block data', 'td.right-block-data', 'a:1:{s:9:\"font-size\";s:4:\"11px\";}', '', 2, 'padding: 7px;\\r\\nbackground: #e3edf6 url(\"/in-commerce4/themes/default/img/bgr_login.jpg\") repeat-y	scroll left top;\\r\\nborder-bottom: 1px solid #64a1df;', 48)",
 						'67' => "(67, 8, 'Pagination bar: text', 'table.block-pagination td', 'a:3:{s:5:\"color\";s:7:\"#8B898B\";s:9:\"font-size\";s:4:\"12px\";s:11:\"font-weight\";s:6:\"normal\";}', '', 1, '', 0)",
 						'45' => "(45, 8, 'Category link', 'a.subcat', 'a:0:{}', 'Category link', 1, 'color: #2069A4', 0)",
 						'68' => "(68, 8, 'Pagination bar: link', 'table.block-pagination td a', 'a:3:{s:5:\"color\";s:7:\"#8B898B\";s:9:\"font-size\";s:5:\"12px;\";s:11:\"font-weight\";s:6:\"normal\";}', '', 1, '', 0)",
 						'69' => "(69, 8, 'Product description in product list', '.product-list-description', 'a:2:{s:5:\"color\";s:7:\"#8B898B\";s:9:\"font-size\";s:4:\"12px\";}', '', 1, '', 0)",
 						'73' => "(73, 8, 'Main path link', 'table.main-path td a', 'a:0:{}', '', 1, 'color: #d5e231;', 0)",
 						'83' => "(83, 8, 'Product title link in list (shopping cart)', 'a.link-product-cart', 'a:0:{}', 'Product title link', 1, 'color: #18559C;\\r\\nfont-size: 12px;\\r\\nfont-weight: bold;\\r\\ntext-decoration: none;\\r\\n\\r\\n', 0)",
 						'72' => "(72, 8, 'Main path block text', 'table.main-path td', 'a:0:{}', '', 1, 'color: #ffffff;\\r\\nfont-size: 10px;\\r\\nfont-weight: normal;\\r\\npadding: 1px;\\r\\n', 0)",
 						'61' => "(61, 8, 'Block: header of data table', 'td.block-data-grid-header', 'a:6:{s:4:\"font\";s:28:\"Arial, Helvetica, sans-serif\";s:5:\"color\";s:7:\"#009DF6\";s:9:\"font-size\";s:4:\"12px\";s:11:\"font-weight\";s:4:\"bold\";s:16:\"background-color\";s:7:\"#E6EEFF\";s:7:\"padding\";s:3:\"6px\";}', '', 1, 'white-space: nowrap;\\r\\npadding-left: 10px;\\r\\n/*\\r\\nbackground-image: url(/in-commerce4/themes/default/img/bullet1.gif);\\r\\nbackground-position: 10px 12px;\\r\\nbackground-repeat: no-repeat;\\r\\n*/', 0)",
 						'65' => "(65, 8, 'Link in product list additional row', 'td.product-list-additional a', 'a:1:{s:5:\"color\";s:7:\"#8B898B\";}', '', 2, '', 64)",
 						'55' => "(55, 8, 'Main table, left column', 'td.main-column-left', 'a:0:{}', '', 1, 'width:180px;\\r\\nborder: 1px solid #62A1DE;\\r\\nborder-top: 0px;', 0)",
 						'70' => "(70, 8, 'Product title link in list (category)', 'a.link-product-category', 'a:0:{}', 'Product title link', 1, 'color: #18559C;\\r\\nfont-size: 12px;\\r\\nfont-weight: bold;\\r\\ntext-decoration: none;\\r\\n\\r\\n', 0)",
 						'66' => "(66, 8, 'Pagination bar block', 'table.block-pagination', 'a:0:{}', '', 1, '', 0)",
 						'49' => "(49, 8, 'Bulleted list inside block', 'td.block-data ul li', 'a:0:{}', '', 1, '    list-style-image: url(/in-commerce4/themes/default/img/bullet2.gif);\\r\\n    margin-bottom: 10px;\\r\\n    font-size: 11px;', 0)",
 						'87' => "(87, 8, 'Cart item input form element', 'td.cart-item-atributes input', 'a:0:{}', '', 1, 'border: 1px solid #7BB2E6;', 0)",
 						'119' => "(119, 8, 'Data grid row header', 'td.block-data-row-hdr', 'a:0:{}', 'Used in order preview', 2, 'background-color: #eeeeee;\\r\\nborder-bottom: 1px solid #dddddd;\\r\\nborder-top: 1px solid #cccccc;\\r\\nfont-weight: bold;', 48)",
 						'82' => "(82, 8, '\"More\" link image', 'a.link-more img', 'a:0:{}', '', 2, 'text-decoration: none;\\r\\npadding-left: 5px;', 64)",
 						'63' => "(63, 8, 'Additional info under product description in list', 'td.product-list-additional', 'a:5:{s:5:\"color\";s:7:\"#8B898B\";s:9:\"font-size\";s:4:\"11px\";s:11:\"font-weight\";s:6:\"normal\";s:10:\"border-top\";s:18:\"1px dashed #8B898B\";s:13:\"border-bottom\";s:18:\"1px dashed #8B898B\";}', '', 2, '', 48)",
 						'43' => "(43, 8, 'Block', 'table.block', 'a:2:{s:16:\"background-color\";s:7:\"#E3EEF9\";s:6:\"border\";s:17:\"1px solid #64A1DF\";}', 'Block', 1, 'border: 0; \\r\\nmargin-bottom: 1px;\\r\\nwidth: 100%;', 0)",
 						'84' => "(84, 8, 'Cart item cell', 'td.cart-item', 'a:0:{}', '', 1, 'background-color: #F6FAFF;\\r\\nborder-left: 1px solid #ffffff;\\r\\nborder-bottom: 1px solid #ffffff;\\r\\npadding: 4px;', 0)",
 						'57' => "(57, 8, 'Main table, right column', 'td.main-column-right', 'a:0:{}', '', 1, 'width:220px;\\r\\nborder: 1px solid #62A1DE;\\r\\nborder-top: 0px;', 0)",
 						'161' => "(161, 8, 'Block for sub categories', 'td.block-data-subcats', 'a:0:{}', '', 2, '  background: #FFFFFF\\r\\nurl(/in-commerce4/themes/default/in-commerce/img/bgr_categories.jpg);\\r\\n  background-repeat: no-repeat;\\r\\n  background-position: top right;\\r\\nborder-bottom: 5px solid #DEEAFF;\\r\\npadding-left: 10px;', 48)",
 						'77' => "(77, 8, 'Left block header', 'td.left-block-header', 'a:0:{}', '', 2, 'font-family : verdana, helvetica, sans-serif;\\r\\ncolor : #ffffff;\\r\\nfont-size : 12px;\\r\\nfont-weight : bold;\\r\\ntext-decoration : none;\\r\\nbackground-color: #64a1df;\\r\\npadding: 5px;\\r\\npadding-left: 7px;', 42)",
 						'80' => "(80, 8, 'Right block data - text', 'td.right-block-data td', 'a:1:{s:9:\"font-size\";s:5:\"11px;\";}', '', 2, '', 48)",
 						'53' => "(53, 8, 'Right block header', 'td.right-block-header', 'a:0:{}', '', 2, 'font-family : verdana, helvetica, sans-serif;\\r\\ncolor : #ffffff;\\r\\nfont-size : 12px;\\r\\nfont-weight : bold;\\r\\ntext-decoration : none;\\r\\nbackground-color: #64a1df;\\r\\npadding: 5px;\\r\\npadding-left: 7px;', 42)",
 						'85' => "(85, 8, 'Cart item cell with attributes', 'td.cart-item-attributes', 'a:0:{}', '', 1, 'background-color: #E6EEFF;\\r\\nborder-left: 1px solid #ffffff;\\r\\nborder-bottom: 1px solid #ffffff;\\r\\npadding: 4px;\\r\\ntext-align: center;\\r\\nvertical-align: middle;\\r\\nfont-size: 12px;\\r\\nfont-weight: normal;', 0)",
 						'86' => "(86, 8, 'Cart item cell with name', 'td.cart-item-name', 'a:0:{}', '', 1, 'background-color: #F6FAFF;\\r\\nborder-left: 1px solid #ffffff;\\r\\nborder-bottom: 1px solid #ffffff;\\r\\npadding: 3px;', 0)",
 						'47' => "(47, 8, 'Block content of featured product', 'td.featured-block-data', 'a:0:{}', '', 1, 'font-family: Arial,Helvetica,sans-serif;\\r\\nfont-size: 12px;', 0)",
 						'56' => "(56, 8, 'Main table, middle column', 'td.main-column-center', 'a:0:{}', '', 1, '\\r\\n', 0)",
 						'50' => "(50, 8, 'Product title link in list', 'a.link-product2', 'a:0:{}', 'Product title link', 1, 'color: #62A1DE;\\r\\nfont-size: 12px;\\r\\nfont-weight: bold;\\r\\ntext-decoration: none;\\r\\n\\r\\n', 0)",
 						'71' => "(71, 8, 'Main path block', 'table.main-path', 'a:0:{}', '', 1, 'background: #61b0ec url(\"/in-commerce4/themes/default/img/bgr_path.jpg\") repeat-y scroll left top;\\r\\nwidth: 100%;\\r\\nmargin-bottom: 1px;\\r\\nmargin-right: 1px; \\r\\nmargin-left: 1px;', 0)",
 						'62' => "(62, 8, 'Block: columns header for data table', 'table.block-no-border th', 'a:6:{s:4:\"font\";s:28:\"Arial, Helvetica, sans-serif\";s:5:\"color\";s:7:\"#18559C\";s:9:\"font-size\";s:4:\"11px\";s:11:\"font-weight\";s:4:\"bold\";s:16:\"background-color\";s:7:\"#B4D2EE\";s:7:\"padding\";s:3:\"6px\";}', '', 1, 'text-align: left;', 0)",
 						'59' => "(59, 8, 'Block without border', 'table.block-no-border', 'a:0:{}', '', 1, 'border: 0px; \\r\\nmargin-bottom: 10px;\\r\\nwidth: 100%;', 0)",
 						'74' => "(74, 8, 'Main path language selector cell', 'td.main-path-language', 'a:0:{}', '', 1, 'vertical-align: middle;\\r\\ntext-align: right;\\r\\npadding-right: 6px;', 0)",
 						'171' => "(171, 8, 'Calendar''s highlighted day', '.calendar tbody .hilite', 'a:0:{}', '', 1, 'background-color: #f6f6f6;\\r\\nborder: 1px solid #83B2C5 !important;', 0)",
 						'175' => "(175, 8, 'Calendar''s days', '.calendar tbody .day', 'a:0:{}', '', 1, 'text-align: right;\\r\\npadding: 2px 4px 2px 2px;\\r\\nwidth: 2em;\\r\\nborder: 1px solid #fefefe;', 0)",
 						'170' => "(170, 8, 'Calendar''s weekends', '.calendar .weekend', 'a:0:{}', '', 1, 'color: #990000;', 0)",
 						'173' => "(173, 8, 'Calendar''s control buttons', '.calendar .calendar_button', 'a:0:{}', '', 1, 'color: black;\\r\\nfont-size: 12px;\\r\\nbackground-color: #eeeeee;', 0)",
 						'174' => "(174, 8, 'Calendar''s day names', '.calendar thead .name', 'a:0:{}', '', 1, 'background-color: #DEEEF6;\\r\\nborder-bottom: 1px solid #000000;', 0)",
 						'172' => "(172, 8, 'Calendar''s top and bottom titles', '.calendar .title', 'a:0:{}', '', 1, 'color: #FFFFFF;\\r\\nbackground-color: #62A1DE;\\r\\nborder: 1px solid #107DC5;\\r\\nborder-top: 0px;\\r\\npadding: 1px;', 0)",
 						'60' => "(60, 8, 'Block header for featured product', 'td.featured-block-header', 'a:0:{}', '', 2, '\\r\\n', 42)",
 						'54' => "(54, 8, 'Right block', 'table.right-block', 'a:0:{}', '', 2, 'background-color: #E3EEF9;\\r\\nborder: 0px;\\r\\nwidth: 100%;', 43)",
 						'44' => "(44, 8, 'Block content', 'td.block-data-big', 'a:0:{}', 'Block content', 1, '  background: #DEEEF6\\r\\nurl(/in-commerce4/themes/default/img/menu_bg.gif);\\r\\n  background-repeat: no-repeat;\\r\\n  background-position: top right;\\r\\n', 0)",
 					),
 				),
 
 				'Stylesheets' => Array (
 					'UniqueField' => 'StylesheetId',
 					'Records' => Array (
 						'8' => "(8, 'Default', 'In-Portal Default Theme', '', 1124952555, 1)",
 					),
 				),
 
 				'Counters' => Array (
 					'UniqueField' => 'Name',
 					'Records' => Array (
 						'members_count' => "(DEFAULT, 'members_count', 'SELECT COUNT(*) FROM <%PREFIX%>PortalUser WHERE Status = 1', NULL , NULL , '3600', '0', '|PortalUser|')",
 						'members_online' => "(DEFAULT, 'members_online', 'SELECT COUNT(*) FROM <%PREFIX%>UserSession WHERE PortalUserId > 0', NULL , NULL , '3600', '0', '|UserSession|')",
 						'guests_online' => "(DEFAULT, 'guests_online', 'SELECT COUNT(*) FROM <%PREFIX%>UserSession WHERE PortalUserId <= 0', NULL , NULL , '3600', '0', '|UserSession|')",
 						'users_online' => "(DEFAULT, 'users_online', 'SELECT COUNT(*) FROM <%PREFIX%>UserSession', NULL , NULL , '3600', '0', '|UserSession|')",
 					),
 				),
 			);
 
 			// check & insert if not found defined before data
 			foreach ($data as $table_name => $table_info) {
 				$unique_fields = explode(';', $table_info['UniqueField']);
 				foreach ($table_info['Records'] as $unique_value => $insert_sql) {
 					$unique_values = explode(';', $unique_value);
 
 					$where_clause = Array ();
 					foreach ($unique_fields as $field_index => $unique_field) {
 						$where_clause[] = $unique_field . ' = ' . $this->Conn->qstr($unique_values[$field_index]);
 					}
 
 					$sql = 'SELECT ' . implode(', ', $unique_fields) . '
 							FROM ' . TABLE_PREFIX . $table_name . '
 							WHERE (' . implode(') AND (', $where_clause) . ')';
 					$found = $this->Conn->GetRow($sql);
 					if ($found) {
 						$found = implode(';', $found);
 					}
 
 					if ($found != $unique_value) {
 						$this->Conn->Query('INSERT INTO ' . TABLE_PREFIX . $table_name . ' VALUES ' . $insert_sql);
 					}
 				}
 			}
 		}
 
 		/**
 		 * Removes duplicate phrases per language basis (created during proj-base and in-portal shared installation)
 		 *
 		 */
 		function _removeDuplicatePhrases()
 		{
 			$config = $this->Application->getUnitConfig('phrases');
 			$id_field = $config->getIDField();
 			$table_name = $config->getTableName();
 
 			$sql = 'SELECT LanguageId, Phrase, MIN(LastChanged) AS LastChanged, COUNT(*) AS DupeCount
 					FROM ' . $table_name . '
 					GROUP BY LanguageId, Phrase
 					HAVING COUNT(*) > 1';
 			$duplicate_phrases = $this->Conn->Query($sql);
 
 			foreach ($duplicate_phrases as $phrase_record) {
 				// 1. keep phrase, that was added first, because it is selected in kPhraseCache::LoadPhraseByLabel.
 				$where_clause = Array (
 					'LanguageId = ' . $phrase_record['LanguageId'],
 					'Phrase = ' . $this->Conn->qstr($phrase_record['Phrase']),
 					'LastChanged' . ' = ' . $phrase_record['LastChanged'],
 				);
 
 				$sql = 'SELECT ' . $id_field . '
 						FROM ' . $table_name . '
 						WHERE (' . implode(') AND (', $where_clause) . ')';
 				$phrase_id = $this->Conn->GetOne($sql);
 
 				// 2. delete all other duplicates
 				$where_clause = Array (
 					'LanguageId = ' . $phrase_record['LanguageId'],
 					'Phrase = ' . $this->Conn->qstr($phrase_record['Phrase']),
 					$id_field . ' <> ' . $phrase_id,
 				);
 
 				$sql = 'DELETE FROM ' . $table_name . '
 						WHERE (' . implode(') AND (', $where_clause) . ')';
 				$this->Conn->Query($sql);
 			}
 		}
 
 		function _moveDatabaseFolders()
 		{
 			// Tables: PageContent, Images
 			if ($this->Conn->TableFound('PageContent', true)) {
 				// 1. replaces "/kernel/user_files/" references in content blocks
+				/** @var kMultiLanguageHelper $ml_helper */
 				$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
-				/* @var $ml_helper kMultiLanguageHelper */
 
 				$languages = $ml_helper->getLanguages();
 				$replace_sql = '%1$s = REPLACE(%1$s, "/kernel/user_files/", "/system/user_files/")';
 
 				$update_sqls = Array ();
 
 				foreach ($languages as $language_id) {
 					$update_sqls[] = sprintf($replace_sql, 'l' . $language_id . '_Content');
 				}
 
 				if ($update_sqls) {
 					$sql = 'UPDATE ' . TABLE_PREFIX . 'PageContent
 							SET ' . implode(', ', $update_sqls);
 					$this->Conn->Query($sql);
 				}
 			}
 
 			// 2. replace path of images uploaded via "Images" tab of category items
 			$this->_replaceImageFolder('/kernel/images/', '/system/images/');
 
 			// 3. replace path of images uploaded via "Images" tab of category items (when badly formatted)
 			$this->_replaceImageFolder('kernel/images/', 'system/images/');
 
 			// 4. replace images uploaded via "In-Bulletin -> Emoticons" section
 			$this->_replaceImageFolder('in-bulletin/images/emoticons/', 'system/images/emoticons/');
 
 			// 5. update backup path in config
 			$this->_toolkit->saveConfigValues(
 				Array (
 					'Backup_Path' => FULL_PATH . '/system/backupdata'
 				)
 			);
 		}
 
 		/**
 		 * Replaces mentions of "/kernel/images" folder in Images table
 		 *
 		 * @param string $from
 		 * @param string $to
 		 */
 		function _replaceImageFolder($from, $to)
 		{
 			$replace_sql = '%1$s = REPLACE(%1$s, "' . $from . '", "' . $to . '")';
 			$sql = 'UPDATE ' . TABLE_PREFIX . 'Images
 					SET ' . sprintf($replace_sql, 'ThumbPath') . ', ' . sprintf($replace_sql, 'LocalPath');
 			$this->Conn->Query($sql);
 		}
 
 
 		/**
 		 * Update colors in skin (only if they were not changed manually)
 		 *
 		 * @param string $mode when called mode {before, after)
 		 */
 		function Upgrade_5_0_0($mode)
 		{
 			if ($mode == 'before') {
 				$this->_removeDuplicatePhrases(); // because In-Commerce & In-Link share some phrases with Proj-CMS
 				$this->_createProjCMSTables();
 				$this->_addMissingConfigurationVariables();
 			}
 
 			if ($mode == 'after') {
 				$this->_fixSkinColors();
 				$this->_restructureCatalog();
 				$this->_sortImages();
 
 //				$this->_sortConfigurationVariables('In-Portal', 'in-portal:configure_general');
 //				$this->_sortConfigurationVariables('In-Portal', 'in-portal:configure_advanced');
 			}
 		}
 
 		function _sortConfigurationVariables($module, $section)
 		{
 			$sql = 'SELECT ca.heading, cv.VariableName
 					FROM ' . TABLE_PREFIX . 'ConfigurationAdmin ca
 					LEFT JOIN ' . TABLE_PREFIX . 'ConfigurationValues cv USING(VariableName)
 					WHERE (cv.ModuleOwner = ' . $this->Conn->qstr($module) . ') AND (cv.Section = ' . $this->Conn->qstr($section) . ')
 					ORDER BY ca.DisplayOrder asc, ca.GroupDisplayOrder asc';
 			$variables = $this->Conn->GetCol($sql, 'VariableName');
 
 			if (!$variables) {
 				return ;
 			}
 
 			$variables = $this->_groupRecords($variables);
 
 			$group_number = 0;
 			$variable_order = 1;
 
 			$prev_heading = '';
 
 			foreach ($variables as $variable_name => $variable_heading) {
 				if ($prev_heading != $variable_heading) {
 					$group_number++;
 					$variable_order = 1;
 				}
 
 				$sql = 'UPDATE ' . TABLE_PREFIX . 'ConfigurationAdmin
 						SET DisplayOrder = ' . $this->Conn->qstr($group_number * 10 + $variable_order / 100) . '
 						WHERE VariableName = ' . $this->Conn->qstr($variable_name);
 				$this->Conn->Query($sql);
 
 				$variable_order++;
 				$prev_heading = $variable_heading;
 			}
 		}
 
 		/**
 		 * Group list records by header, saves internal order in group
 		 *
 		 * @param Array $variables
 		 * @return Array
 		 */
 		function _groupRecords($variables)
 		{
 			$sorted = Array();
 
 			foreach ($variables as $variable_name => $variable_heading) {
 				$sorted[$variable_heading][] = $variable_name;
 			}
 
 			$variables = Array();
 			foreach ($sorted as $heading => $heading_records) {
 				foreach ($heading_records as $variable_name) {
 					$variables[$variable_name] = $heading;
 				}
 			}
 
 			return $variables;
 		}
 
 		/**
 		 * Returns module root category
 		 *
 		 * @param string $module_name
 		 * @param string $module_prefix
 		 * @return int
 		 */
 		function _getRootCategory($module_name, $module_prefix)
 		{
 			// don't cache anything here (like in static variables), because database value is changed on the fly !!!
 			$sql = 'SELECT RootCat
 					FROM ' . TABLE_PREFIX . 'Modules
 					WHERE LOWER(Name) = ' . $this->Conn->qstr( strtolower($module_name) );
 			$root_category = $this->Conn->GetOne($sql);
 
 			// put to cache too, because CategoriesEventHandler::_prepareAutoPage uses kApplication::findModule
 			$this->Application->ModuleInfo[$module_name]['Name'] = $module_name;
 			$this->Application->ModuleInfo[$module_name]['RootCat'] = $root_category;
 			$this->Application->ModuleInfo[$module_name]['Var'] = $module_prefix;
 
 			return $root_category;
 		}
 
 		/**
 		 * Move all categories (except "Content") from "Home" to "Content" category and hide them from menu
 		 *
 		 */
 		function _restructureCatalog()
 		{
 			$root_category = $this->_getRootCategory('Core', 'adm');
 
 			$sql = 'SELECT CategoryId
 					FROM ' . TABLE_PREFIX . 'Category
 					WHERE ParentId = 0 AND CategoryId <> ' . $root_category;
 			$top_categories = $this->Conn->GetCol($sql);
 
 			if ($top_categories) {
 				// hide all categories located outside "Content" category from menu
 				$sql = 'UPDATE ' . TABLE_PREFIX . 'Category
 						SET IsMenu = 0
 						WHERE (ParentPath LIKE "|' . implode('|%") OR (ParentPath LIKE "|', $top_categories) . '|%")';
 				$this->Conn->Query($sql);
 
 				// move all top level categories under "Content" category and make them visible in menu
 				$sql = 'UPDATE ' . TABLE_PREFIX . 'Category
 						SET IsMenu = 1, ParentId = ' . $root_category . '
 						WHERE ParentId = 0 AND CategoryId <> ' . $root_category;
 				$this->Conn->Query($sql);
 			}
 
 			// make sure, that all categories have valid value for Priority field
 
+			/** @var kPriorityHelper $priority_helper */
 			$priority_helper = $this->Application->recallObject('PriorityHelper');
-			/* @var $priority_helper kPriorityHelper */
 
 			$event = new kEvent('c:OnListBuild');
 
 			// update all categories, because they are all under "Content" category now
 			$sql = 'SELECT CategoryId
 					FROM ' . TABLE_PREFIX . 'Category';
 			$categories = $this->Conn->GetCol($sql);
 
 			foreach ($categories as $category_id) {
 				$priority_helper->recalculatePriorities($event, 'ParentId = ' . $category_id);
 			}
 
 			// create initial theme structure in Category table
 			$this->_toolkit->rebuildThemes();
 
 			// make sure, that all system templates have ThemeId set (only possible during platform project upgrade)
 			$sql = 'SELECT ThemeId
 					FROM ' . TABLE_PREFIX . 'Theme
 					WHERE PrimaryTheme = 1';
 			$primary_theme_id = $this->Conn->GetOne($sql);
 
 			if ($primary_theme_id) {
 				$sql = 'UPDATE ' . TABLE_PREFIX . 'Category
 						SET ThemeId = ' . $primary_theme_id . '
 						WHERE IsSystem = 1 AND ThemeId = 0';
 				$this->Conn->Query($sql);
 			}
 		}
 
 		/**
 		 * Changes skin colors to match new ones (only in case, when they match default values)
 		 *
 		 */
 		function _fixSkinColors()
 		{
+			/** @var kDBItem $skin */
 			$skin = $this->Application->recallObject('skin', null, Array ('skip_autoload' => 1));
-			/* @var $skin kDBItem */
 
 			$skin->Load(1, 'IsPrimary');
 			if ($skin->isLoaded()) {
 				$skin_options = unserialize( $skin->GetDBField('Options') );
 
 				$changes = Array (
 					// option: from -> to
 					'HeadBgColor' => Array ('#1961B8', '#007BF4'),
 					'HeadBarColor' => Array ('#FFFFFF', '#000000'),
 
 					'HeadColor' => Array ('#CCFF00', '#FFFFFF'),
 					'TreeColor' => Array ('#006F99', '#000000'),
 					'TreeHoverColor' => Array ('', '#009FF0'),
 					'TreeHighHoverColor' => Array ('', '#FFFFFF'),
 					'TreeHighBgColor' => Array ('#4A92CE', '#4A92CE'),
 					'TreeBgColor' => Array ('#FFFFFF', '#DCECF6'),
 				);
 
 				$can_change = true;
 				foreach ($changes as $option_name => $change) {
 					list ($change_from, $change_to) = $change;
 
 					$can_change = $can_change && ($change_from == $skin_options[$option_name]['Value']);
 					if ($can_change) {
 						$skin_options[$option_name]['Value'] = $change_to;
 					}
 				}
 
 				if ($can_change) {
 					$skin->SetDBField('Options', serialize($skin_options));
 					$skin->Update();
 
+					/** @var SkinHelper $skin_helper */
 					$skin_helper = $this->Application->recallObject('SkinHelper');
-					/* @var $skin_helper SkinHelper */
 
 					$skin_file = $skin_helper->getSkinPath();
 					if (file_exists($skin_file)) {
 						unlink($skin_file);
 					}
 				}
 			}
 		}
 
 		/**
 		 * 1. Set root category not to generate filename automatically and hide it from catalog
 		 * 2. Hide root category of In-Edit and set it's fields
 		 *
 		 * @param int $category_id
 		 */
 		function _resetRootCategory($category_id)
 		{
 			$fields_hash = Array (
 				'l1_Name' => 'Content', 'Filename' => 'Content', 'AutomaticFilename' => 0,
 				'l1_Description' => 'Content', 'Status' => 4,
 			);
 
 			$this->Conn->doUpdate($fields_hash, TABLE_PREFIX . 'Category', 'CategoryId = ' . $category_id);
 		}
 
 		function _createProjCMSTables()
 		{
 			// 0. make sure, that Content category exists
 			$root_category = $this->_getRootCategory('Proj-CMS', 'st');
 			if ($root_category) {
 				// proj-cms module found -> remove it
 				$sql = 'DELETE FROM ' . TABLE_PREFIX . 'Modules
 						WHERE Name = "Proj-CMS"';
 				$this->Conn->Query($sql);
 				unset($this->Application->ModuleInfo['Proj-CMS']);
 
 				$this->_resetRootCategory($root_category);
 
 				// unhide all structure categories
 				$sql = 'UPDATE ' . TABLE_PREFIX . 'Category
 						SET Status = 1
 						WHERE (Status = 4) AND (CategoryId <> ' . $root_category . ')';
 				$this->Conn->Query($sql);
 			} else {
 				$root_category = $this->_getRootCategory('In-Edit', 'cms');
 				if ($root_category) {
 					// in-edit module found -> remove it
 					$sql = 'DELETE FROM ' . TABLE_PREFIX . 'Modules
 							WHERE Name = "In-Edit"';
 					$this->Conn->Query($sql);
 					unset($this->Application->ModuleInfo['In-Edit']);
 
 					$this->_resetRootCategory($root_category);
 				}
 			}
 
 			if (!$root_category) {
 				// create "Content" category when Proj-CMS/In-Edit module was not installed before
 				// use direct sql here, because category table structure doesn't yet match table structure in object
 
 				$fields_hash = Array (
 					'l1_Name' => 'Content', 'Filename' => 'Content', 'AutomaticFilename' => 0,
 					'l1_Description' => 'Content', 'Status' => 4,
 				);
 
 				$this->Conn->doInsert($fields_hash, TABLE_PREFIX . 'Category');
 
 				$root_category = $this->Conn->getInsertID();
 			}
 
 			$this->_toolkit->deleteCache();
 			$this->_toolkit->SetModuleRootCategory('Core', $root_category);
 
 			// 1. process "Category" table
 			$structure = $this->Conn->Query('DESCRIBE ' . TABLE_PREFIX . 'Category', 'Field');
 			if (!array_key_exists('Template', $structure)) {
 				// fields from "Pages" table were not added to "Category" table (like before "Proj-CMS" module install)
 				$sql = "ALTER TABLE " . TABLE_PREFIX . "Category
 							ADD COLUMN Template varchar(255) default NULL,
 							ADD COLUMN l1_Title varchar(255) default '',
 							ADD COLUMN l2_Title varchar(255) default '',
 							ADD COLUMN l3_Title varchar(255) default '',
 							ADD COLUMN l4_Title varchar(255) default '',
 							ADD COLUMN l5_Title varchar(255) default '',
 							ADD COLUMN l1_MenuTitle varchar(255) NOT NULL default '',
 							ADD COLUMN l2_MenuTitle varchar(255) NOT NULL default '',
 							ADD COLUMN l3_MenuTitle varchar(255) NOT NULL default '',
 							ADD COLUMN l4_MenuTitle varchar(255) NOT NULL default '',
 							ADD COLUMN l5_MenuTitle varchar(255) NOT NULL default '',
 							ADD COLUMN MetaTitle text,
 							ADD COLUMN IndexTools text,
 							ADD COLUMN IsIndex tinyint(1) NOT NULL default '0',
 							ADD COLUMN IsMenu TINYINT(4) NOT NULL DEFAULT '1',
 							ADD COLUMN IsSystem tinyint(4) NOT NULL default '0',
 							ADD COLUMN FormId int(11) default NULL,
 							ADD COLUMN FormSubmittedTemplate varchar(255) default NULL,
 							ADD COLUMN l1_Translated tinyint(4) NOT NULL default '0',
 							ADD COLUMN l2_Translated tinyint(4) NOT NULL default '0',
 							ADD COLUMN l3_Translated tinyint(4) NOT NULL default '0',
 							ADD COLUMN l4_Translated tinyint(4) NOT NULL default '0',
 							ADD COLUMN l5_Translated tinyint(4) NOT NULL default '0',
 							ADD COLUMN FriendlyURL varchar(255) NOT NULL default '',
 							ADD INDEX IsIndex (IsIndex),
 							ADD INDEX l1_Translated (l1_Translated),
 							ADD INDEX l2_Translated (l2_Translated),
 							ADD INDEX l3_Translated (l3_Translated),
 							ADD INDEX l4_Translated (l4_Translated),
 							ADD INDEX l5_Translated (l5_Translated)";
 				$this->Conn->Query($sql);
 			}
 
 			if (array_key_exists('Path', $structure)) {
 				$sql = 'ALTER TABLE ' . TABLE_PREFIX . 'Category
 						DROP Path';
 				$this->Conn->Query($sql);
 			}
 
 			// 2. process "PageContent" table
 			if ($this->Conn->TableFound(TABLE_PREFIX . 'PageContent', true)) {
 				$structure = $this->Conn->Query('DESCRIBE ' . TABLE_PREFIX . 'PageContent', 'Field');
 				if (!array_key_exists('l1_Translated', $structure)) {
 					$sql = "ALTER TABLE " . TABLE_PREFIX . "PageContent
 								ADD COLUMN l1_Translated tinyint(4) NOT NULL default '0',
 								ADD COLUMN l2_Translated tinyint(4) NOT NULL default '0',
 								ADD COLUMN l3_Translated tinyint(4) NOT NULL default '0',
 								ADD COLUMN l4_Translated tinyint(4) NOT NULL default '0',
 								ADD COLUMN l5_Translated tinyint(4) NOT NULL default '0'";
 					$this->Conn->Query($sql);
 				}
 			}
 
 			// 3. process "FormFields" table
 			if ($this->Conn->TableFound(TABLE_PREFIX . 'FormFields', true)) {
 				$structure = $this->Conn->Query('DESCRIBE ' . TABLE_PREFIX . 'FormFields', 'Field');
 				if (!$structure['FormId']['Key']) {
 					$sql = "ALTER TABLE " . TABLE_PREFIX . "FormFields
 								CHANGE Validation Validation TINYINT NOT NULL DEFAULT '0',
 								ADD INDEX FormId (FormId),
 								ADD INDEX Priority (Priority),
 								ADD INDEX IsSystem (IsSystem),
 								ADD INDEX DisplayInGrid (DisplayInGrid)";
 					$this->Conn->Query($sql);
 				}
 			}
 			else {
 				$this->Conn->Query("INSERT INTO " . TABLE_PREFIX . "Permissions VALUES (DEFAULT, 'in-portal:forms.view', 11, 1, 1, 0)");
 				$this->Conn->Query("INSERT INTO " . TABLE_PREFIX . "Permissions VALUES (DEFAULT, 'in-portal:forms.add', 11, 1, 1, 0)");
 				$this->Conn->Query("INSERT INTO " . TABLE_PREFIX . "Permissions VALUES (DEFAULT, 'in-portal:forms.edit', 11, 1, 1, 0)");
 				$this->Conn->Query("INSERT INTO " . TABLE_PREFIX . "Permissions VALUES (DEFAULT, 'in-portal:forms.delete', 11, 1, 1, 0)");
 			}
 
 			// 4. process "FormSubmissions" table
 			if ($this->Conn->TableFound(TABLE_PREFIX . 'FormSubmissions', true)) {
 				$structure = $this->Conn->Query('DESCRIBE ' . TABLE_PREFIX . 'FormSubmissions', 'Field');
 				if (!$structure['SubmissionTime']['Key']) {
 					$sql = "ALTER TABLE " . TABLE_PREFIX . "FormSubmissions
 								ADD INDEX SubmissionTime (SubmissionTime)";
 					$this->Conn->Query($sql);
 				}
 			}
 			else {
 				$this->Conn->Query("INSERT INTO " . TABLE_PREFIX . "Permissions VALUES (DEFAULT, 'in-portal:submissions.view', 11, 1, 1, 0)");
 			}
 
 			// 5. add missing event
 			$sql = 'SELECT EventId
 					FROM ' . TABLE_PREFIX . 'Events
 					WHERE (Event = "FORM.SUBMITTED") AND (Type = 1)';
 			$event_id = $this->Conn->GetOne($sql);
 
 			if (!$event_id) {
 				$sql = "INSERT INTO " . TABLE_PREFIX . "Events VALUES (DEFAULT, 'FORM.SUBMITTED', NULL, 1, 0, 'Core:Category', 'la_event_FormSubmitted', 1)";
 				$this->Conn->Query($sql);
 			}
 
 			$sql = 'SELECT EventId
 					FROM ' . TABLE_PREFIX . 'Events
 					WHERE (Event = "FORM.SUBMITTED") AND (Type = 0)';
 			$event_id = $this->Conn->GetOne($sql);
 
 			if (!$event_id) {
 				$sql = "INSERT INTO " . TABLE_PREFIX . "Events VALUES (DEFAULT, 'FORM.SUBMITTED', NULL, 1, 0, 'Core:Category', 'la_event_FormSubmitted', 0)";
 				$this->Conn->Query($sql);
 			}
 		}
 
 		function _addMissingConfigurationVariables()
 		{
 			$variables = Array (
 				'cms_DefaultDesign' => Array (
 					"INSERT INTO " . TABLE_PREFIX . "ConfigurationAdmin VALUES ('cms_DefaultDesign', 'la_Text_General', 'la_prompt_DefaultDesignTemplate', 'text', NULL, NULL, 10.15, 0, 0)",
 					"INSERT INTO " . TABLE_PREFIX . "ConfigurationValues VALUES (DEFAULT, 'cms_DefaultDesign', '/platform/designs/general', 'In-Portal', 'in-portal:configure_categories')",
 				),
 
 				'Require_AdminSSL' => Array (
 					"INSERT INTO " . TABLE_PREFIX . "ConfigurationAdmin VALUES ('Require_AdminSSL', 'la_Text_Website', 'la_config_RequireSSLAdmin', 'checkbox', '', '', 10.105, 0, 1)",
 					"INSERT INTO " . TABLE_PREFIX . "ConfigurationValues VALUES (DEFAULT, 'Require_AdminSSL', '', 'In-Portal', 'in-portal:configure_advanced')",
 				),
 
 				'UsePopups' => Array (
 					"INSERT INTO " . TABLE_PREFIX . "ConfigurationAdmin VALUES ('UsePopups', 'la_Text_Website', 'la_config_UsePopups', 'radio', '', '1=la_Yes,0=la_No', 10.221, 0, 0)",
 					"INSERT INTO " . TABLE_PREFIX . "ConfigurationValues VALUES (DEFAULT, 'UsePopups', '1', 'In-Portal', 'in-portal:configure_advanced')",
 				),
 
 				'UseDoubleSorting' => Array (
 					"INSERT INTO " . TABLE_PREFIX . "ConfigurationAdmin VALUES ('UseDoubleSorting', 'la_Text_Website', 'la_config_UseDoubleSorting', 'radio', '', '1=la_Yes,0=la_No', 10.222, 0, 0)",
 					"INSERT INTO " . TABLE_PREFIX . "ConfigurationValues VALUES (DEFAULT, 'UseDoubleSorting', '0', 'In-Portal', 'in-portal:configure_advanced')",
 				),
 
 				'MenuFrameWidth' => Array (
 					"INSERT INTO " . TABLE_PREFIX . "ConfigurationAdmin VALUES ('MenuFrameWidth', 'la_title_General', 'la_prompt_MenuFrameWidth', 'text', NULL, NULL, 10.31, 0, 0)",
 					"INSERT INTO " . TABLE_PREFIX . "ConfigurationValues VALUES (DEFAULT, 'MenuFrameWidth', 200, 'In-Portal', 'in-portal:configure_advanced')",
 				),
 
 				'DefaultSettingsUserId' => Array (
 					"INSERT INTO " . TABLE_PREFIX . "ConfigurationAdmin VALUES ('DefaultSettingsUserId', 'la_title_General', 'la_prompt_DefaultUserId', 'text', NULL, NULL, '10.06', '0', '0')",
 					"INSERT INTO " . TABLE_PREFIX . "ConfigurationValues VALUES (DEFAULT, 'DefaultSettingsUserId', -1, 'In-Portal:Users', 'in-portal:configure_users')",
 				),
 			);
 
 			foreach ($variables as $variable_name => $variable_sqls) {
 				$sql = 'SELECT VariableId
 						FROM ' . TABLE_PREFIX . 'ConfigurationValues
 						WHERE VariableName = ' . $this->Conn->qstr($variable_name);
 				$variable_id = $this->Conn->GetOne($sql);
 
 				if ($variable_id) {
 					continue;
 				}
 
 				foreach ($variable_sqls as $variable_sql) {
 					$this->Conn->Query($variable_sql);
 				}
 			}
 		}
 
 		/**
 		 * Sort images in database (update Priority field)
 		 *
 		 */
 		function _sortImages()
 		{
 			$sql = 'SELECT *
 					FROM ' . TABLE_PREFIX . 'Images
 					ORDER BY ResourceId ASC , DefaultImg DESC , ImageId ASC';
 			$images = $this->Conn->Query($sql);
 
 			$priority = 0;
 			$last_resource_id = false;
 
 			foreach ($images as $image) {
 				if ($image['ResourceId'] != $last_resource_id) {
 					// each item have own priorities among it's images
 					$priority = 0;
 					$last_resource_id = $image['ResourceId'];
 				}
 
 				if (!$image['DefaultImg']) {
 					$priority--;
 				}
 
 				$sql = 'UPDATE ' . TABLE_PREFIX . 'Images
 						SET Priority = ' . $priority . '
 						WHERE ImageId = ' . $image['ImageId'];
 				$this->Conn->Query($sql);
 			}
 		}
 
 		/**
 		 * Update to 5.0.1
 		 *
 		 * @param string $mode when called mode {before, after)
 		 */
 		function Upgrade_5_0_1($mode)
 		{
 			if ($mode == 'after') {
 				// delete old events
 				$events_to_delete = Array ('CATEGORY.MODIFY', 'CATEGORY.DELETE');
 
 				$sql = 'SELECT EventId
 						FROM ' . TABLE_PREFIX . 'Events
 						WHERE Event IN ("' . implode('","', $events_to_delete) . '")';
 				$event_ids = $this->Conn->GetCol($sql);
 
 				if ($event_ids) {
 					$this->_deleteEvents($event_ids);
 
 					$sql = 'DELETE FROM ' . TABLE_PREFIX . 'Phrase
 							WHERE Phrase IN ("la_event_category.modify", "la_event_category.delete")';
 					$this->Conn->Query($sql);
 				}
 
 				// partially delete events
 				$sql = 'SELECT EventId
 						FROM ' . TABLE_PREFIX . 'Events
 						WHERE (Event IN ("CATEGORY.APPROVE", "CATEGORY.DENY")) AND (Type = ' . EmailTemplate::TEMPLATE_TYPE_ADMIN . ')';
 				$event_ids = $this->Conn->GetCol($sql);
 
 				if ($event_ids) {
 					$this->_deleteEvents($event_ids);
 				}
 			}
 		}
 
 		function _deleteEvents($ids)
 		{
 			$sql = 'DELETE FROM ' . TABLE_PREFIX . 'EmailMessage
 					WHERE EventId IN (' . implode(',', $ids) . ')';
 			$this->Conn->Query($sql);
 
 			$sql = 'DELETE FROM ' . TABLE_PREFIX . 'Events
 					WHERE EventId IN (' . implode(',', $ids) . ')';
 			$this->Conn->Query($sql);
 		}
 
 		/**
 		 * Update to 5.0.2-B2; Transforms IsIndex field values to SymLinkCategoryId field
 		 *
 		 * @param string $mode when called mode {before, after)
 		 */
 		function Upgrade_5_0_2_B2($mode)
 		{
 			// 0 - Regular, 1 - Category Index, 2 - Container
 
 			if ($mode == 'before') {
 				// fix "Content" category
 				$fields_hash = Array (
 					'CreatedById' => USER_ROOT,
 					'CreatedOn' => time(),
 					'ResourceId' => $this->Application->NextResourceId(),
 				);
 
 				$category_id = $this->Application->findModule('Name', 'Core', 'RootCat');
 				$this->Conn->doUpdate($fields_hash, TABLE_PREFIX . 'Category', 'CategoryId = ' . $category_id);
 
 				// get all categories, marked as category index
 				$sql = 'SELECT ParentPath, CategoryId
 						FROM ' . TABLE_PREFIX . 'Category
 						WHERE IsIndex = 1';
 				$category_indexes = $this->Conn->GetCol($sql, 'CategoryId');
 
 				foreach ($category_indexes as $category_id => $parent_path) {
 					$parent_path = explode('|', substr($parent_path, 1, -1));
 
 					// set symlink to $category_id for each category, marked as container in given category path
 					$sql = 'SELECT CategoryId
 							FROM ' . TABLE_PREFIX . 'Category
 							WHERE CategoryId IN (' . implode(',', $parent_path) . ') AND (IsIndex = 2)';
 					$category_containers = $this->Conn->GetCol($sql);
 
 					if ($category_containers) {
 						$sql = 'UPDATE ' . TABLE_PREFIX . 'Category
 								SET SymLinkCategoryId = ' . $category_id . '
 								WHERE CategoryId IN (' . implode(',', $category_containers) . ')';
 						$this->Conn->Query($sql);
 					}
 
 				}
 			}
 
 			if ($mode == 'after') {
 				// scan theme to fill Theme.TemplateAliases and ThemeFiles.TemplateAlias fields
 				$this->_toolkit->rebuildThemes();
 
 				$sql = 'SELECT TemplateAliases, ThemeId
 						FROM ' . TABLE_PREFIX . 'Theme
 						WHERE (Enabled = 1) AND (TemplateAliases <> "")';
 				$template_aliases = $this->Conn->GetCol($sql, 'ThemeId');
 
 				$all_template_aliases = Array (); // reversed alias (from real template to alias)
 
 				foreach ($template_aliases as $theme_id => $theme_template_aliases) {
 					$theme_template_aliases = unserialize($theme_template_aliases);
 
 					if (!$theme_template_aliases) {
 						continue;
 					}
 
 					$all_template_aliases = array_merge($all_template_aliases, array_flip($theme_template_aliases));
 				}
 
 				$default_design_replaced = false;
 				$default_design = trim($this->Application->ConfigValue('cms_DefaultDesign'), '/');
 
 				foreach ($all_template_aliases as $from_template => $to_alias) {
 					// replace default design in configuration variable (when matches alias)
 					if ($from_template == $default_design) {
 						// specific alias matched
 						$sql = 'UPDATE ' . TABLE_PREFIX . 'ConfigurationValues
 								SET VariableValue = ' . $this->Conn->qstr($to_alias) . '
 								WHERE VariableName = "cms_DefaultDesign"';
 						$this->Conn->Query($sql);
 
 						$default_design_replaced = true;
 					}
 
 					// replace Category.Template and Category.CachedTemplate fields (when matches alias)
 					$sql = 'UPDATE ' . TABLE_PREFIX . 'Category
 							SET Template = ' . $this->Conn->qstr($to_alias) . '
 							WHERE Template IN (' . $this->Conn->qstr('/' . $from_template) . ',' . $this->Conn->qstr($from_template) . ')';
 					$this->Conn->Query($sql);
 
 					$sql = 'UPDATE ' . TABLE_PREFIX . 'Category
 							SET CachedTemplate = ' . $this->Conn->qstr($to_alias) . '
 							WHERE CachedTemplate IN (' . $this->Conn->qstr('/' . $from_template) . ',' . $this->Conn->qstr($from_template) . ')';
 					$this->Conn->Query($sql);
 				}
 
 				if (!$default_design_replaced) {
 					// in case if current default design template doesn't
 					// match any of aliases, then set it to #default_design#
 					$sql = 'UPDATE ' . TABLE_PREFIX . 'ConfigurationValues
 							SET VariableValue = "#default_design#"
 							WHERE VariableName = "cms_DefaultDesign"';
 					$this->Conn->Query($sql);
 				}
 
 				// replace data in category custom fields used for category item template storage
+				/** @var kRewriteUrlProcessor $rewrite_processor */
 				$rewrite_processor = $this->Application->recallObject('kRewriteUrlProcessor');
-				/* @var $rewrite_processor kRewriteUrlProcessor */
 
 				foreach ($this->Application->ModuleInfo as $module_name => $module_info) {
 					$custom_field_id = $rewrite_processor->getItemTemplateCustomField($module_info['Var']);
 
 					if (!$custom_field_id) {
 						continue;
 					}
 
 					foreach ($all_template_aliases as $from_template => $to_alias) {
 						$sql = 'UPDATE ' . TABLE_PREFIX . 'CategoryCustomData
 								SET l1_cust_' . $custom_field_id . ' = ' . $this->Conn->qstr($to_alias) . '
 								WHERE l1_cust_' . $custom_field_id . ' = ' . $this->Conn->qstr($from_template);
 						$this->Conn->Query($sql);
 					}
 				}
 			}
 		}
 
 		/**
 		 * Update to 5.0.3-B2; Moves CATEGORY.* permission from module root categories to Content category
 		 *
 		 * @param string $mode when called mode {before, after)
 		 */
 		function Upgrade_5_0_3_B2($mode)
 		{
 			if ($mode == 'before') {
 				// get permissions
 				$sql = 'SELECT PermissionName
 						FROM ' . TABLE_PREFIX . 'PermissionConfig
 						WHERE PermissionName LIKE "CATEGORY.%"';
 				$permission_names = $this->Conn->GetCol($sql);
 
 				// get groups
 				$sql = 'SELECT GroupId
 						FROM ' . TABLE_PREFIX . 'PortalGroup';
 				$user_groups = $this->Conn->GetCol($sql);
 				$user_group_count = count($user_groups);
 
 				// get module root categories
 				$sql = 'SELECT RootCat
 						FROM ' . TABLE_PREFIX . 'Modules';
 				$module_categories = $this->Conn->GetCol($sql);
 
 				$module_categories[] = 0;
 				$module_categories = implode(',', array_unique($module_categories));
 
 				$permissions = $delete_permission_ids = Array ();
 
 				foreach ($permission_names as $permission_name) {
 					foreach ($user_groups as $group_id) {
 						$sql = 'SELECT PermissionId
 								FROM ' . TABLE_PREFIX . 'Permissions
 								WHERE (Permission = ' . $this->Conn->qstr($permission_name) . ') AND (PermissionValue = 1) AND (GroupId = ' . $group_id . ') AND (`Type` = 0) AND (CatId IN (' . $module_categories . '))';
 						$permission_ids = $this->Conn->GetCol($sql);
 
 						if ($permission_ids) {
 							if (!array_key_exists($permission_name, $permissions)) {
 								$permissions[$permission_name] = Array ();
 							}
 
 							$permissions[$permission_name][] = $group_id;
 							$delete_permission_ids = array_merge($delete_permission_ids, $permission_ids);
 						}
 					}
 				}
 
 				if ($delete_permission_ids) {
 					// here we can delete some of permissions that will be added later
 					$sql = 'DELETE FROM ' . TABLE_PREFIX . 'Permissions
 							WHERE PermissionId IN (' . implode(',', $delete_permission_ids) . ')';
 					$this->Conn->Query($sql);
 				}
 
 				$home_category = $this->Application->findModule('Name', 'Core', 'RootCat');
 
 				foreach ($permissions as $permission_name => $permission_groups) {
 					// optimize a bit
 					$has_everyone = in_array(15, $permission_groups);
 
 					if ($has_everyone || (!$has_everyone && count($permission_groups) == $user_group_count - 1)) {
 						// has permission for "Everyone" group OR allowed in all groups except "Everyone" group
 						// so remove all other explicitly allowed permissions
 						$permission_groups = Array (15);
 					}
 
 					foreach ($permission_groups as $group_id) {
 						$fields_hash = Array (
 							'Permission' => $permission_name,
 							'GroupId' => $group_id,
 							'PermissionValue' => 1,
 							'Type' => 0, // category-based permission,
 							'CatId' => $home_category,
 						);
 
 						$this->Conn->doInsert($fields_hash, TABLE_PREFIX . 'Permissions');
 					}
 				}
 
+				/** @var kPermCacheUpdater $updater */
 				$updater = $this->Application->makeClass('kPermCacheUpdater');
-				/* @var $updater kPermCacheUpdater */
 
 				$updater->OneStepRun();
 			}
 		}
 
 		/**
 		 * Update to 5.1.0-B1; Makes email message fields multilingual
 		 *
 		 * @param string $mode when called mode {before, after)
 		 */
 		function Upgrade_5_1_0_B1($mode)
 		{
 			if ( $mode == 'before' ) {
 				$this->_renameTables('from');
 
 				// migrate email events
 				$table_structure = $this->Conn->Query('DESCRIBE ' . TABLE_PREFIX . 'Events', 'Field');
 
 				if (!array_key_exists('Headers', $table_structure)) {
 					$sql = 'ALTER TABLE ' . TABLE_PREFIX . 'Events
 							ADD `Headers` TEXT NULL AFTER `ReplacementTags`,
 							ADD `MessageType` VARCHAR(4) NOT NULL default "text" AFTER `Headers`';
 					$this->Conn->Query($sql);
 				}
 
 				// alter here, because kMultiLanguageHelper::createFields
 				// method, called after will expect that to be in database
 				$sql = 'ALTER TABLE ' . TABLE_PREFIX . 'Events
 							ADD AllowChangingSender TINYINT NOT NULL DEFAULT "0" AFTER MessageType ,
 							ADD CustomSender TINYINT NOT NULL DEFAULT "0" AFTER AllowChangingSender ,
 							ADD SenderName VARCHAR(255) NOT NULL DEFAULT "" AFTER CustomSender ,
 							ADD SenderAddressType TINYINT NOT NULL DEFAULT "0" AFTER SenderName ,
 							ADD SenderAddress VARCHAR(255) NOT NULL DEFAULT "" AFTER SenderAddressType ,
 							ADD AllowChangingRecipient TINYINT NOT NULL DEFAULT "0" AFTER SenderAddress ,
 							ADD CustomRecipient TINYINT NOT NULL DEFAULT "0" AFTER AllowChangingRecipient ,
 							ADD Recipients TEXT AFTER CustomRecipient,
 							ADD INDEX (AllowChangingSender),
 							ADD INDEX (CustomSender),
 							ADD INDEX (SenderAddressType),
 							ADD INDEX (AllowChangingRecipient),
 							ADD INDEX (CustomRecipient)';
 				$this->Conn->Query($sql);
 
 				// create multilingual fields for phrases and email events
+				/** @var kMultiLanguageHelper $ml_helper */
 				$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
-				/* @var $ml_helper kMultiLanguageHelper */
 
 				$ml_helper->createFields('phrases');
 				$ml_helper->createFields('email-template');
 				$languages = $ml_helper->getLanguages();
 
 				if ($this->Conn->TableFound(TABLE_PREFIX . 'EmailMessage', true)) {
+					/** @var kEmailTemplateHelper $email_template_helper */
 					$email_template_helper = $this->Application->recallObject('kEmailTemplateHelper');
-					/* @var $email_template_helper kEmailTemplateHelper */
 
 					foreach ($languages as $language_id) {
 						$sql = 'SELECT EmailMessageId, Template, EventId
 								FROM ' . TABLE_PREFIX . 'EmailMessage
 								WHERE LanguageId = ' . $language_id;
 						$translations = $this->Conn->Query($sql, 'EventId');
 
 						foreach ($translations as $event_id => $translation_data) {
 							$parsed = $email_template_helper->parseTemplate($translation_data['Template'], 'html');
 
 							$fields_hash = Array (
 								'l' . $language_id . '_Subject' => $parsed['Subject'],
 								'l' . $language_id . '_Body' => $parsed['HtmlBody'],
 							);
 
 							if ( $parsed['Headers'] ) {
 								$fields_hash['Headers'] = $parsed['Headers'];
 							}
 
 							$this->Conn->doUpdate($fields_hash, TABLE_PREFIX . 'Events', 'EventId = ' . $event_id);
 
 							$sql = 'DELETE FROM ' . TABLE_PREFIX . 'EmailMessage
 									WHERE EmailMessageId = ' . $translation_data['EmailMessageId'];
 							$this->Conn->Query($sql);
 						}
 					}
 				}
 
 				// migrate phrases
 				$temp_table = $this->Application->GetTempName(TABLE_PREFIX . 'Phrase');
 
 				$sqls = Array (
 					'DROP TABLE IF EXISTS ' . $temp_table,
 					'CREATE TABLE ' . $temp_table . ' LIKE ' . TABLE_PREFIX . 'Phrase',
 					'ALTER TABLE ' . $temp_table . ' DROP LanguageId, DROP Translation',
 					'ALTER IGNORE TABLE ' . $temp_table . ' DROP INDEX LanguageId_2',
 					'ALTER TABLE ' . $temp_table . ' DROP PhraseId',
 					'ALTER TABLE ' . $temp_table . ' ADD PhraseId INT NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST',
 				);
 
 				foreach ($sqls as $sql) {
 					$this->Conn->Query($sql);
 				}
 
 				$already_added = Array ();
 				$primary_language_id = $this->Application->GetDefaultLanguageId();
 
 				foreach ($languages as $language_id) {
 					$sql = 'SELECT Phrase, PhraseKey, Translation AS l' . $language_id . '_Translation, PhraseType, LastChanged, LastChangeIP, Module
 							FROM ' . TABLE_PREFIX . 'Phrase
 							WHERE LanguageId = ' . $language_id;
 					$phrases = $this->Conn->Query($sql, 'Phrase');
 
 					foreach ($phrases as $phrase => $fields_hash) {
 						if (array_key_exists($phrase, $already_added)) {
 							$this->Conn->doUpdate($fields_hash, $temp_table, 'PhraseId = ' . $already_added[$phrase]);
 						}
 						else {
 							$this->Conn->doInsert($fields_hash, $temp_table);
 							$already_added[$phrase] = $this->Conn->getInsertID();
 						}
 					}
 
 					// in case some phrases were found in this language, but not in primary language -> copy them
 					if ($language_id != $primary_language_id) {
 						$sql = 'UPDATE ' . $temp_table . '
 								SET l' . $primary_language_id . '_Translation = l' . $language_id . '_Translation
 								WHERE l' . $primary_language_id . '_Translation IS NULL';
 						$this->Conn->Query($sql);
 					}
 				}
 
 				$this->Conn->Query('DROP TABLE IF EXISTS ' . TABLE_PREFIX . 'Phrase');
 				$this->Conn->Query('RENAME TABLE ' . $temp_table . ' TO ' . TABLE_PREFIX . 'Phrase');
 
 				$this->_updateCountryStatesTable();
 				$this->_replaceConfigurationValueSeparator();
 
 				// save "config.php" in php format, not ini format as before
 				$this->_toolkit->SaveConfig();
 			}
 
 			if ($mode == 'after') {
 				$this->_transformEmailRecipients();
 				$this->_fixSkinColors();
 			}
 		}
 
 		/**
 		 * Makes sure we rename tables to legacy names before doing other upgrades before 5.2.0-B1 upgrade
 		 *
 		 * @param string $name
 		 * @param Array $arguments
 		 */
 		public function __call($name, $arguments)
 		{
 			if ( substr($name, 0, 12) == 'Upgrade_5_1_' && $arguments[0] == 'before' ) {
 				$this->_renameTables('from');
 			}
 
 			if ( substr($name, 0, 13) == 'Upgrade_5_2_0' && $arguments[0] == 'before' ) {
 				$this->_renameTables('to');
 			}
 		}
 
 		/**
 		 * Move country/state translations from Phrase to CountryStates table
 		 *
 		 */
 		function _updateCountryStatesTable()
 		{
 			// refactor StdDestinations table
 			$sql = 'RENAME TABLE ' . TABLE_PREFIX . 'StdDestinations TO ' . TABLE_PREFIX . 'CountryStates';
 			$this->Conn->Query($sql);
 
 			$sql = 'ALTER TABLE ' . TABLE_PREFIX . 'CountryStates
 						CHANGE DestId CountryStateId INT(11) NOT NULL AUTO_INCREMENT,
 						CHANGE DestType Type INT(11) NOT NULL DEFAULT \'1\',
 						CHANGE DestParentId StateCountryId INT(11) NULL DEFAULT NULL,
 						CHANGE DestAbbr IsoCode CHAR(3) NOT NULL DEFAULT \'\',
 						CHANGE DestAbbr2 ShortIsoCode CHAR(2) NULL DEFAULT NULL,
 						DROP INDEX DestType,
 						DROP INDEX DestParentId,
 						ADD INDEX (`Type`),
 						ADD INDEX (StateCountryId)';
 			$this->Conn->Query($sql);
 
+			/** @var kMultiLanguageHelper $ml_helper */
 			$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
-			/* @var $ml_helper kMultiLanguageHelper */
 
 			$ml_helper->createFields('country-state');
 			$languages = $ml_helper->getLanguages();
 
 			foreach ($languages as $language_id) {
 				$sub_select = '	SELECT l' . $language_id . '_Translation
 								FROM ' . TABLE_PREFIX . 'Phrase
 								WHERE Phrase = DestName';
 
 				$sql = 'UPDATE ' . TABLE_PREFIX . 'CountryStates
 						SET l' . $language_id . '_Name = (' . $sub_select . ')';
 				$this->Conn->Query($sql);
 			}
 
 			$sql = 'ALTER TABLE ' . TABLE_PREFIX . 'CountryStates
 					DROP DestName';
 			$this->Conn->Query($sql);
 
 			$sql = 'DELETE FROM ' . TABLE_PREFIX . 'Phrase
 					WHERE Phrase LIKE ' . $this->Conn->qstr('la_country_%') . ' OR Phrase LIKE ' . $this->Conn->qstr('la_state_%');
 			$this->Conn->Query($sql);
 		}
 
 		/**
 		 * Makes configuration values dropdowns use "||" as separator
 		 *
 		 */
 		function _replaceConfigurationValueSeparator()
 		{
+			/** @var InpCustomFieldsHelper $custom_field_helper */
 			$custom_field_helper = $this->Application->recallObject('InpCustomFieldsHelper');
-			/* @var $custom_field_helper InpCustomFieldsHelper */
 
 			$sql = 'SELECT ValueList, VariableName
 					FROM ' . TABLE_PREFIX . 'ConfigurationAdmin
 					WHERE ValueList LIKE "%,%"';
 			$variables = $this->Conn->GetCol($sql, 'VariableName');
 
 			foreach ($variables as $variable_name => $value_list) {
 				$ret = Array ();
 				$options = $custom_field_helper->GetValuesHash($value_list, ',', false);
 
 				foreach ($options as $option_key => $option_title) {
 					if (substr($option_key, 0, 3) == 'SQL') {
 						$ret[] = $option_title;
 					}
 					else {
 						$ret[] = $option_key . '=' . $option_title;
 					}
 				}
 
 				$fields_hash = Array (
 					'ValueList' => implode(VALUE_LIST_SEPARATOR, $ret),
 				);
 
 				$this->Conn->doUpdate($fields_hash, TABLE_PREFIX . 'ConfigurationAdmin', 'VariableName = ' . $this->Conn->qstr($variable_name));
 			}
 		}
 
 		/**
 		 * Transforms "FromUserId" into Sender* and Recipients columns
 		 *
 		 */
 		function _transformEmailRecipients()
 		{
 			$sql = 'SELECT FromUserId, Type, EventId
 					FROM ' . TABLE_PREFIX . 'Events
 					WHERE FromUserId IS NOT NULL AND (FromUserId <> ' . USER_ROOT . ')';
 			$events = $this->Conn->Query($sql, 'EventId');
 
+			/** @var MInputHelper $minput_helper */
 			$minput_helper = $this->Application->recallObject('MInputHelper');
-			/* @var $minput_helper MInputHelper */
 
 			foreach ($events as $event_id => $event_data) {
 				$sql = 'SELECT Login
 						FROM ' . TABLE_PREFIX . 'PortalUser
 						WHERE PortalUserId = ' . $event_data['FromUserId'];
 				$username = $this->Conn->GetOne($sql);
 
 				if (!$username) {
 					continue;
 				}
 
 				if ($event_data['Type'] == EmailTemplate::TEMPLATE_TYPE_FRONTEND) {
 					// from user
 					$fields_hash = Array (
 						'CustomSender' => 1,
 						'SenderAddressType' => EmailTemplate::ADDRESS_TYPE_USER,
 						'SenderAddress' => $username
 					);
 				}
 
 				if ($event_data['Type'] == EmailTemplate::TEMPLATE_TYPE_ADMIN) {
 					// to user
 					$records = Array (
 						Array (
 							'RecipientType' => EmailTemplate::RECIPIENT_TYPE_TO,
 							'RecipientName' => '',
 							'RecipientAddressType' => EmailTemplate::ADDRESS_TYPE_USER,
 							'RecipientAddress' => $username
 						)
 					);
 
 					$fields_hash = Array (
 						'CustomRecipient' => 1,
 						'Recipients' => $minput_helper->prepareMInputXML($records, array_keys( reset($records) ))
 					);
 				}
 
 				$this->Conn->doUpdate($fields_hash, TABLE_PREFIX . 'Events', 'EventId = ' . $event_id);
 			}
 
 			$this->Conn->Query('ALTER TABLE ' . TABLE_PREFIX . 'Events DROP FromUserId');
 		}
 
 		/**
 		 * Update to 5.1.0; Fixes refferer of form submissions
 		 *
 		 * @param string $mode when called mode {before, after)
 		 */
 		function Upgrade_5_1_0($mode)
 		{
 			if ( $mode == 'before' ) {
 				$this->_renameTables('from');
 			}
 
 			if ( $mode == 'after' ) {
 				$base_url = $this->Application->BaseURL();
 
 				$sql = 'UPDATE ' . TABLE_PREFIX . 'FormSubmissions
 						SET ReferrerURL = REPLACE(ReferrerURL, ' . $this->Conn->qstr($base_url) . ', "/")';
 				$this->Conn->Query($sql);
 			}
 		}
 
 		/**
 		 * Update to 5.1.1-B1; Transforms DisplayToPublic logic
 		 *
 		 * @param string $mode when called mode {before, after)
 		 */
 		function Upgrade_5_1_1_B1($mode)
 		{
 			if ( $mode == 'before' ) {
 				$this->_renameTables('from');
 			}
 
 			if ($mode == 'after') {
 				$this->processDisplayToPublic();
 			}
 		}
 
 		function processDisplayToPublic()
 		{
 			$profile_mapping = Array (
 				'pp_firstname' => 'FirstName',
 				'pp_lastname' => 'LastName',
 				'pp_dob' => 'dob',
 				'pp_email' => 'Email',
 				'pp_phone' => 'Phone',
 				'pp_street' => 'Street',
 				'pp_city' => 'City',
 				'pp_state' => 'State',
 				'pp_zip' => 'Zip',
 				'pp_country' => 'Country',
 			);
 
 			$fields = array_keys($profile_mapping);
 			$fields = $this->Conn->qstrArray($fields);
 			$where_clause = 'VariableName IN (' . implode(',', $fields) . ')';
 
 			// 1. get user, that have saved their profile at least once
 			$sql = 'SELECT DISTINCT PortalUserId
 					FROM ' . TABLE_PREFIX . 'PersistantSessionData
 					WHERE ' . $where_clause;
 			$users = $this->Conn->GetCol($sql);
 
 			foreach ($users as $user_id) {
 				// 2. convert to new format
 				$sql = 'SELECT VariableValue, VariableName
 						FROM ' . TABLE_PREFIX . 'PersistantSessionData
 						WHERE (PortalUserId = ' . $user_id . ') AND ' . $where_clause;
 				$user_variables = $this->Conn->GetCol($sql, 'VariableName');
 
 				// go through mapping to preserve variable order
 				$value = Array ();
 
 				foreach ($profile_mapping as $from_name => $to_name) {
 					if (array_key_exists($from_name, $user_variables) && $user_variables[$from_name]) {
 						$value[] = $to_name;
 					}
 				}
 
 				if ($value) {
 					$fields_hash = Array (
 						'DisplayToPublic' => '|' . implode('|', $value) . '|',
 					);
 
 					$this->Conn->doUpdate($fields_hash, TABLE_PREFIX . 'PortalUser', 'PortalUserId = ' . $user_id);
 				}
 
 				// 3. delete old style variables
 				$sql = 'DELETE FROM ' . TABLE_PREFIX . 'PersistantSessionData
 						WHERE (PortalUserId = ' . $user_id . ') AND ' . $where_clause;
 				$this->Conn->Query($sql);
 			}
 		}
 
 		/**
 		 * Update to 5.1.3; Merges column and field phrases
 		 *
 		 * @param string $mode when called mode {before, after)
 		 */
 		function Upgrade_5_1_3($mode)
 		{
 			if ( $mode == 'before' ) {
 				$this->_renameTables('from');
 			}
 
 			if ( $mode == 'after' ) {
 				$this->moveTranslation('LA_COL_', 'LA_FLD_', 'ColumnTranslation');
 			}
 		}
 
 		/**
 		 * Makes sure table names match upgrade script
 		 *
 		 * @param string $key
 		 * @return void
 		 * @access private
 		 */
 		private function _renameTables($key)
 		{
 			foreach ($this->renamedTables as $prefix => $table_info) {
 				$this->Application->getUnitConfig($prefix)->setTableName(TABLE_PREFIX . $table_info[$key]);
 			}
 		}
 
 		/**
 		 * Update to 5.2.0-B1; Transform list sortings storage
 		 *
 		 * @param string $mode when called mode {before, after)
 		 */
 		public function Upgrade_5_2_0_B1($mode)
 		{
 			if ( $mode == 'before' ) {
 				$this->_renameTables('to');
 			}
 
 			if ( $mode == 'after' ) {
 				$this->transformSortings();
 				$this->moveTranslation('LA_COL_', 'LA_FLD_', 'ColumnTranslation'); // because of "la_col_ItemPrefix" phrase
 				$this->moveTranslation('LA_HINT_', 'LA_FLD_', 'HintTranslation');
 				$this->moveTranslation('LA_HINT_', 'LA_CONFIG_', 'HintTranslation');
 				$this->moveTranslation('LA_HINT_', 'LA_TITLE_', 'HintTranslation');
 				$this->createPageRevisions();
 			}
 		}
 
 		/**
 		 * Transforms a way, how list sortings are stored
 		 *
 		 * @return void
 		 */
 		function transformSortings()
 		{
 			$sql = 'SELECT VariableName, PortalUserId
 					FROM ' . TABLE_PREFIX . 'UserPersistentSessionData
 					WHERE VariableName LIKE "%_Sort1.%"';
 			$sortings = $this->Conn->Query($sql);
 
 			foreach ($sortings AS $sorting) {
 				if ( !preg_match('/^(.*)_Sort1.(.*)$/', $sorting['VariableName'], $regs) ) {
 					continue;
 				}
 
 				$user_id = $sorting['PortalUserId'];
 				$prefix_special = $regs[1] . '_';
 				$view_name = '.' . $regs[2];
 
 				$old_variable_names = Array (
 					$prefix_special . 'Sort1' . $view_name, $prefix_special . 'Sort1_Dir' . $view_name,
 					$prefix_special . 'Sort2' . $view_name, $prefix_special . 'Sort2_Dir' . $view_name,
 				);
 				$old_variable_names = $this->Conn->qstrArray($old_variable_names);
 
 				$sql = 'SELECT VariableValue, VariableName
 						FROM ' . TABLE_PREFIX . 'UserPersistentSessionData
 						WHERE PortalUserId = ' . $user_id . ' AND VariableName IN (' . implode(',', $old_variable_names) . ')';
 				$sorting_data = $this->Conn->GetCol($sql, 'VariableName');
 
 				// prepare & save new sortings
 				$new_sorting = Array (
 					'Sort1' => $sorting_data[$prefix_special . 'Sort1' . $view_name],
 					'Sort1_Dir' => $sorting_data[$prefix_special . 'Sort1_Dir' . $view_name],
 				);
 
 				if ( isset($sorting_data[$prefix_special . 'Sort2' . $view_name]) ) {
 					$new_sorting['Sort2'] = $sorting_data[$prefix_special . 'Sort2' . $view_name];
 					$new_sorting['Sort2_Dir'] = $sorting_data[$prefix_special . 'Sort2_Dir' . $view_name];
 				}
 
 				$fields_hash = Array (
 					'PortalUserId' => $user_id,
 					'VariableName' => $prefix_special . 'Sortings' . $view_name,
 					'VariableValue' => serialize($new_sorting),
 				);
 
 				$this->Conn->doInsert($fields_hash, TABLE_PREFIX . 'UserPersistentSessionData');
 
 				// delete sortings, that were already processed
 				$sql = 'DELETE FROM ' . TABLE_PREFIX . 'UserPersistentSessionData
 						WHERE PortalUserId = ' . $user_id . ' AND VariableName IN (' . implode(',', $old_variable_names) . ')';
 				$this->Conn->Query($sql);
 			}
 		}
 
 		/**
 		 * Merges several phrases into one (e.g. la_col_ + la_hint_ into designated columns of la_fld_ phrases)
 		 *
 		 * @param string $source_prefix
 		 * @param string $target_prefix
 		 * @param string $db_column
 		 * @return void
 		 * @access protected
 		 */
 		public function moveTranslation($source_prefix, $target_prefix, $db_column)
 		{
 			$source_phrases = $this->getPhrasesByMask($source_prefix . '%');
 			$target_phrases = $this->getPhrasesByMask($target_prefix . '%');
 
+			/** @var kMultiLanguageHelper $ml_helper */
 			$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
-			/* @var $ml_helper kMultiLanguageHelper */
 
 			$delete_ids = Array ();
 			$ml_helper->createFields('phrases');
 			$languages = $ml_helper->getLanguages();
 			$phrase_table = $this->Application->getUnitConfig('phrases')->getTableName();
 
 			foreach ($source_phrases as $phrase_key => $phrase_info) {
 				$target_phrase_key = $target_prefix . substr($phrase_key, strlen($source_prefix));
 
 				if ( !isset($target_phrases[$target_phrase_key]) ) {
 					continue;
 				}
 
 				$fields_hash = Array ();
 
 				// copy column phrase main translation into field phrase column translation
 				foreach ($languages as $language_id) {
 					$fields_hash['l' . $language_id . '_' . $db_column] = $phrase_info['l' . $language_id . '_Translation'];
 				}
 
 				$delete_ids[] = $phrase_info['PhraseId'];
 				$this->Conn->doUpdate($fields_hash, $phrase_table, 'PhraseId = ' . $target_phrases[$target_phrase_key]['PhraseId']);
 			}
 
 			// delete all column phrases, that were absorbed by field phrases
 			if ( $delete_ids ) {
 				$sql = 'DELETE FROM ' . $phrase_table . '
 						WHERE PhraseId IN (' . implode(',', $delete_ids) . ')';
 				$this->Conn->Query($sql);
 
 				$sql = 'DELETE FROM ' . TABLE_PREFIX . 'PhraseCache';
 				$this->Conn->Query($sql);
 			}
 		}
 
 		/**
 		 * Returns phrases by mask
 		 *
 		 * @param string $mask
 		 * @return Array
 		 * @access protected
 		 */
 		protected function getPhrasesByMask($mask)
 		{
 			$sql = 'SELECT *
 					FROM ' . $this->Application->getUnitConfig('phrases')->getTableName() . '
 					WHERE PhraseKey LIKE ' . $this->Conn->qstr($mask);
 
 			return $this->Conn->Query($sql, 'PhraseKey');
 		}
 
 		protected function createPageRevisions()
 		{
 			$sql = 'SELECT DISTINCT PageId
 					FROM ' . TABLE_PREFIX . 'PageContent';
 			$page_ids = $this->Conn->GetCol($sql);
 
 			foreach ($page_ids as $page_id) {
 				$fields_hash = Array (
 					'PageId' => $page_id,
 					'RevisionNumber' => 1,
 					'IsDraft' => 0,
 					'FromRevisionId' => 0,
 					'CreatedById' => USER_ROOT,
 					'CreatedOn' => time(),
 					'Status' => STATUS_ACTIVE,
 				);
 
 				$this->Conn->doInsert($fields_hash, TABLE_PREFIX . 'PageRevisions');
 
 				$fields_hash = Array (
 					'RevisionId' => $this->Conn->getInsertID(),
 				);
 
 				$this->Conn->doUpdate($fields_hash, TABLE_PREFIX . 'PageContent', 'PageId = ' . $page_id);
 			}
 		}
 
 		/**
 		 * Update to 5.2.0-B3; Introduces separate field for plain-text e-mail event translations
 		 *
 		 * @param string $mode when called mode {before, after)
 		 */
 		public function Upgrade_5_2_0_B3($mode)
 		{
 			if ( $mode == 'before' ) {
 				$this->_renameTables('to');
 			}
 
 			if ( $mode == 'after' ) {
 				$this->_splitEmailBody();
 				$this->_migrateCommonFooter();
 			}
 		}
 
 		/**
 		 * Splits e-mail body into HTML and Text fields
 		 *
 		 * @return void
 		 * @access private
 		 */
 		private function _splitEmailBody()
 		{
 			$config = $this->Application->getUnitConfig('email-template');
 			$id_field = $config->getIDField();
 			$table_name = $config->getTableName();
 			$fields = $this->Conn->Query('DESCRIBE ' . $table_name, 'Field');
 
 			// The "_renameTables" method doesn't rename IDField, so find real one in DESCRIBE result.
 			if ( !isset($fields[$id_field]) ) {
 				$id_field = 'EventId';
 			}
 
 			if ( !isset($fields['l1_Body']) ) {
 				// column dropped - nothing to convert anymore
 				return;
 			}
 
+			/** @var kMultiLanguageHelper $ml_helper */
 			$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
-			/* @var $ml_helper kMultiLanguageHelper */
 
 			$languages = $ml_helper->getLanguages();
 			$ml_helper->createFields('email-template');
 
 			$sql = 'SELECT *
 					FROM ' . $table_name;
 			$email_events = $this->Conn->Query($sql);
 
 			// 1. move data to new columns
 			foreach ($email_events as $email_event) {
 				$fields_hash = Array ();
 				$translation_field = $email_event['MessageType'] == 'html' ? 'HtmlBody' : 'PlainTextBody';
 
 				foreach ($languages as $language_id) {
 					$fields_hash['l' . $language_id . '_' . $translation_field] = $email_event['l' . $language_id . '_Body'];
 				}
 
 				if ( $fields_hash ) {
 					$this->Conn->doUpdate($fields_hash, $table_name, $id_field . ' = ' . $email_event[$id_field]);
 				}
 			}
 
 			// 2. drop old columns
 			$drops = Array ('DROP COLUMN MessageType');
 
 			foreach ($languages as $language_id) {
 				$lang_field = 'l' . $language_id . '_Body';
 
 				if ( isset($fields[$lang_field]) ) {
 					$drops[] = 'DROP COLUMN ' . $lang_field;
 				}
 			}
 
 			$this->Conn->Query('ALTER TABLE ' . $table_name . ' ' . implode(', ', $drops));
 		}
 
 		/**
 		 * Transforms COMMON.FOOTER e-mail event into new field in Languages table
 		 */
 		private function _migrateCommonFooter()
 		{
+			/** @var kMultiLanguageHelper $ml_helper */
 			$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
-			/* @var $ml_helper kMultiLanguageHelper */
 
 			$languages = $ml_helper->getLanguages();
 
 			$event_table = $this->Application->getUnitConfig('email-template')->getTableName();
 
 			$sql = 'SELECT *
 					FROM ' . $event_table . '
 					WHERE Event = "COMMON.FOOTER"';
 			$footer_data = $this->Conn->GetRow($sql);
 
 			if ( !$footer_data ) {
 				return;
 			}
 
 			$primary_language_id = $this->Application->GetDefaultLanguageId();
 			$table_name = $this->Application->getUnitConfig('lang')->getTableName();
 
 			foreach ($languages as $language_id) {
 				$is_primary = $language_id == $primary_language_id;
 
 				$fields_hash = Array (
 					'HtmlEmailTemplate' => $this->_appendEmailDesignBody($footer_data['l' . $language_id . '_HtmlBody'], $is_primary),
 					'TextEmailTemplate' => $this->_appendEmailDesignBody($footer_data['l' . $language_id . '_PlainTextBody'], $is_primary),
 				);
 
 				$this->Conn->doUpdate($fields_hash, $table_name, 'LanguageId = ' . $language_id);
 			}
 
 			$sql = 'DELETE FROM ' . $event_table . '
 					WHERE EventId = ' . $footer_data['EventId'];
 			$this->Conn->Query($sql);
 		}
 
 		/**
 		 * Adds "$body" to given string
 		 *
 		 * @param string $string
 		 * @param bool $is_primary for primary language
 		 * @return string
 		 * @access private
 		 */
 		private function _appendEmailDesignBody($string, $is_primary)
 		{
 			if ( !$string ) {
 				return $is_primary ? '$body' : $string;
 			}
 
 			return '$body' . "\n" . str_replace(Array ("\r\n", "\r"), "\n", $string);
 		}
 
 		/**
 		 * Update to 5.2.0-RC1
 		 *
 		 * @param string $mode when called mode {before, after)
 		 */
 		public function Upgrade_5_2_0_RC1($mode)
 		{
 			if ( $mode != 'before' ) {
 				return;
 			}
 
+			/** @var kMultiLanguageHelper $ml_helper */
 			$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
-			/* @var $ml_helper kMultiLanguageHelper */
 
 			// make some promo block fields translatable
 			$ml_helper->createFields('promo-block');
 
 			$table_name = $this->Application->getUnitConfig('promo-block')->getTableName();
 			$table_structure = $this->Conn->Query('DESCRIBE ' . $table_name, 'Field');
 
 			if ( isset($table_structure['Title']) ) {
 				$sql = 'UPDATE ' . $table_name . '
 						SET l' . $this->Application->GetDefaultLanguageId() . '_Title = Title';
 				$this->Conn->Query($sql);
 
 				$sql = 'ALTER TABLE ' . $table_name . ' DROP Title';
 				$this->Conn->Query($sql);
 			}
 
 			// fix e-mail event translations
 			$languages = $ml_helper->getLanguages();
 			$table_name = $this->Application->getUnitConfig('email-template')->getTableName();
 
 			$change_fields = Array ('Subject', 'HtmlBody', 'PlainTextBody');
 
 			foreach ($languages as $language_id) {
 				foreach ($change_fields as $change_field) {
 					$change_field = 'l' . $language_id . '_' . $change_field;
 
 					$sql = "UPDATE " . $table_name . "
 							SET {$change_field} = REPLACE({$change_field}, '<inp2:m_BaseUrl/>', '<inp2:m_Link template=\"index\"/>')
 							WHERE  {$change_field} LIKE '%m_BaseURL%'";
 					$this->Conn->Query($sql);
 				}
 			}
 
 			// add new ml columns to phrases/e-mail events
 			$ml_helper->createFields('phrases');
 			$ml_helper->createFields('email-template');
 		}
 
 		/**
 		 * Update to 5.2.0
 		 *
 		 * @param string $mode when called mode {before, after)
 		 */
 		public function Upgrade_5_2_0($mode)
 		{
 			if ( $mode != 'after' ) {
 				return;
 			}
 
 			$table_name = $this->Application->getUnitConfig('c')->getTableName();
 
 			$sql = 'SELECT NamedParentPath, CachedTemplate, CategoryId
 					FROM ' . $table_name;
 			$categories = $this->Conn->GetIterator($sql);
 
 			foreach ($categories as $category_data) {
 				$fields_hash = Array (
 					'NamedParentPathHash' => kUtil::crc32(mb_strtolower(preg_replace('/^Content\//i', '', $category_data['NamedParentPath']))),
 					'CachedTemplateHash' => kUtil::crc32(mb_strtolower($category_data['CachedTemplate'])),
 				);
 
 				$this->Conn->doUpdate($fields_hash, $table_name, 'CategoryId = ' . $category_data['CategoryId']);
 			}
 
 			$rebuild_mode = $this->Application->ConfigValue('QuickCategoryPermissionRebuild') ? CategoryPermissionRebuild::SILENT : CategoryPermissionRebuild::AUTOMATIC;
 			$this->Application->SetConfigValue('CategoryPermissionRebuildMode', $rebuild_mode);
 
 			$sql = 'DELETE FROM ' . TABLE_PREFIX . 'SystemSettings WHERE VariableName = "QuickCategoryPermissionRebuild"';
 			$this->Conn->Query($sql);
 
 			$this->_updateScheduledTaskRunSchedule();
 		}
 
 		/**
 		 * Transforms RunInterval into RunSchedule column for Scheduled Tasks
 		 *
 		 * @return void
 		 * @access protected
 		 */
 		protected function _updateScheduledTaskRunSchedule()
 		{
 			// minute hour day_of_month month day_of_week
 			$config = $this->Application->getUnitConfig('scheduled-task');
 			$id_field = $config->getIDField();
 			$table_name = $config->getTableName();
 
 			$sql = 'SELECT RunInterval, ' . $id_field . '
 					FROM ' . $table_name;
 			$run_intervals = $this->Conn->GetCol($sql, $id_field);
 
 			$ranges = Array (0 => 'min', 1 => 'hour', 2 => 'day', 3 => 'month');
 			$range_values = Array ('min' => 60, 'hour' => 60, 'day' => 24, 'month' => 30);
 			$range_masks = Array ('min' => '*/%s * * * *', 'hour' => '0 */%s * * *', 'day' => '0 0 */%s * *', 'month' => '0 0 1 */%s *');
 
 			foreach ($run_intervals as $scheduled_task_id => $interval) {
 				$mask_index = 'month';
 
 				foreach ($ranges as $range_index => $range_name) {
 					$range_value = $range_values[$range_name];
 
 					if ( $interval >= $range_value ) {
 						$interval = ceil($interval / $range_value);
 					}
 					else {
 						$mask_index = $ranges[$range_index - 1];
 						break;
 					}
 				}
 
 				$run_schedule = sprintf($range_masks[$mask_index], $interval);
 
 				if ( $run_schedule == '0 0 */7 * *' ) {
 					// once in 7 days = once in a week
 					$run_schedule = '0 0 * * 0';
 				}
 
 				$run_schedule = preg_replace('/(\*\/1( |$))/', '*\\2', $run_schedule);
 
 				$fields_hash = Array ('RunSchedule' => $run_schedule);
 				$this->Conn->doUpdate($fields_hash, $table_name, $id_field . ' = ' . $scheduled_task_id);
 			}
 
 			// drop RunInterval column
 			$this->Conn->Query('ALTER TABLE ' . $table_name . ' DROP RunInterval');
 		}
 
 		/**
 		 * Update to 5.2.1-B1
 		 *
 		 * @param string $mode when called mode {before, after)
 		 */
 		public function Upgrade_5_2_1_B1($mode)
 		{
 			if ( $mode != 'after' ) {
 				return;
 			}
 
 			$this->_updateUserPasswords();
 		}
 
 		protected function _updateUserPasswords()
 		{
 			$user_table = $this->Application->getUnitConfig('u')->getTableName();
 
 			$sql = 'SELECT Password, PortalUserId
 					FROM ' . $user_table . '
 					WHERE PasswordHashingMethod = ' . PasswordHashingMethod::MD5;
 			$user_passwords = $this->Conn->GetColIterator($sql, 'PortalUserId');
 
 			if ( !count($user_passwords) ) {
 				// no users at all or existing users have converted passwords already
 				return;
 			}
 
 			kUtil::setResourceLimit();
 
+			/** @var kPasswordFormatter $password_formatter */
 			$password_formatter = $this->Application->recallObject('kPasswordFormatter');
-			/* @var $password_formatter kPasswordFormatter */
 
 			foreach ($user_passwords as $user_id => $user_password) {
 				$fields_hash = Array (
 					'Password' => $password_formatter->hashPassword($user_password, '', PasswordHashingMethod::MD5_AND_PHPPASS),
 					'PasswordHashingMethod' => PasswordHashingMethod::MD5_AND_PHPPASS,
 				);
 
 				$this->Conn->doUpdate($fields_hash, TABLE_PREFIX . 'Users', 'PortalUserId = ' . $user_id);
 			}
 		}
 
 		/**
 		 * Update to 5.2.2-B1
 		 *
 		 * @param string $mode when called mode {before, after)
 		 */
 		public function Upgrade_5_2_2_B1($mode)
 		{
 			if ( $mode != 'after' ) {
 				return;
 			}
 
 			$this->deleteThumbnails();
 		}
 
 		/**
 		 * Deletes folders, containing thumbnails recursively.
 		 *
 		 * @param string $folder Folder.
 		 *
 		 * @return void
 		 */
 		protected function deleteThumbnails($folder = WRITEABLE)
 		{
 			foreach ( glob($folder . '/*', GLOB_ONLYDIR) as $sub_folder ) {
 				if ( $sub_folder === WRITEABLE . '/cache' ) {
 					continue;
 				}
 
 				if ( basename($sub_folder) === 'resized' ) {
 					$files = glob($sub_folder . '/*');
 					array_map('unlink', $files);
 					rmdir($sub_folder);
 				}
 				else {
 					$this->deleteThumbnails($sub_folder);
 				}
 			}
 		}
 
 		/**
 		 * Update to 5.3.0-B1
 		 *
 		 * @param string $mode when called mode {before, after)
 		 */
 		public function Upgrade_5_3_0_B1($mode)
 		{
 			if ( $mode == 'before' ) {
 				$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
 				/* @var $ml_helper kMultiLanguageHelper */
 
 				// add new ml columns to phrases/e-mail events
 				$ml_helper->createFields('phrases');
 				$ml_helper->createFields('email-template');
 			}
 			elseif ( $mode == 'after' ) {
 				$sql = 'SELECT Event, ScheduledTaskId
 						FROM ' . TABLE_PREFIX . 'ScheduledTasks';
 				$scheduled_tasks = $this->Conn->GetCol($sql, 'ScheduledTaskId');
 
 				foreach ( $scheduled_tasks as $id => $event_string ) {
 					$event = new kEvent($event_string);
 					$module = $event->getUnitConfig()->getModule();
 
 					$this->Conn->doUpdate(
 						array('Module' => $module),
 						TABLE_PREFIX . 'ScheduledTasks',
 						'ScheduledTaskId = ' . $id
 					);
 				}
 
 				$this->updateDeploymentLog();
 				$this->migrateSSLSettings();
 				$this->migrateSSLSiteDomains();
 			}
 		}
 
 		/**
 		 * Upgrades project deployment log.
 		 *
 		 * @return void
 		 */
 		protected function updateDeploymentLog()
 		{
 			$log = $this->Application->recallObject('module-deployment-log', null, array('skip_autoload' => true));
 			/* @var $log kDBItem */
 
 			$table_name = $this->Application->getUnitConfig('mod')->getTableName();
 			$structure = $this->Conn->Query('DESCRIBE ' . $table_name, 'Field');
 
 			if ( !isset($structure['AppliedDBRevisions']) ) {
 				return;
 			}
 
 			$sql = 'SELECT Name, Path, AppliedDBRevisions
 					FROM ' . $table_name . '
 					WHERE COALESCE(AppliedDBRevisions, "") <> ""';
 			$modules = $this->Conn->Query($sql, 'Name');
 
 			foreach ( $modules as $module_name => $module_data ) {
 				$filename = FULL_PATH . DIRECTORY_SEPARATOR . $module_data['Path'] . 'install/project_upgrades.sql';
 
 				if ( !file_exists($filename) ) {
 					continue;
 				}
 
 				$sqls = file_get_contents($filename);
 				preg_match_all("/# r([\d]+)([^\:]*):(.*?)(\n|$)/s", $sqls, $matches, PREG_SET_ORDER + PREG_OFFSET_CAPTURE);
 
 				if ( !$matches ) {
 					continue;
 				}
 
 				$revisions = array_flip(explode(',', $module_data['AppliedDBRevisions']));
 
 				foreach ( $matches as $match ) {
 					$revision_number = $match[1][0];
 
 					if ( !isset($revisions[$revision_number]) ) {
 						continue;
 					}
 
 					$log->Clear();
 					$log->SetDBField('Module', $module_name);
 					$log->SetDBField('RevisionNumber', $revision_number);
 					$log->SetDBField('RevisionTitle', trim($match[3][0]));
 					$log->SetDBField('IPAddress', '0.0.0.0');
 					$log->SetDBField('Output', 'IMPORTED');
 					$log->Create();
 				}
 			}
 
 			$sql = 'ALTER TABLE ' . $table_name . ' DROP AppliedDBRevisions';
 			$this->Conn->Query($sql);
 		}
 
 		/**
 		 * Migrates SSL settings to new format.
 		 *
 		 * @return void
 		 */
 		protected function migrateSSLSettings()
 		{
 			$mapping = array(
 				'SSL_URL' => 'SSLDomain',
 				'AdminSSL_URL' => 'AdminSSLDomain',
 			);
 
 			foreach ( $mapping as $old_setting => $new_setting ) {
 				$old_value = $this->Application->ConfigValue($old_setting);
 
 				if ( $old_value ) {
 					$this->Application->SetConfigValue($new_setting, parse_url($old_value, PHP_URL_HOST));
 				}
 
 				$sql = 'DELETE FROM ' . $this->Application->getUnitConfig('conf')->getTableName() . '
 						WHERE VariableName = ' . $this->Conn->qstr($old_setting);
 				$this->Conn->Query($sql);
 			}
 		}
 
 		/**
 		 * Migrates SSL site domains.
 		 *
 		 * @return void
 		 */
 		protected function migrateSSLSiteDomains()
 		{
 			/** @var kDBItem $object */
 			$object = $this->Application->recallObject('site-domain.migrate', null, array('skip_autoload' => true));
 
 			$sql = 'SELECT *
 					FROM ' . $this->Application->getUnitConfig('site-domain')->getTableName() . '
 					WHERE SSLDomainName <> ""';
 			$site_domains = $this->Conn->Query($sql);
 
 			foreach ( $site_domains as $site_domain ) {
 				if ( strpos($site_domain['SSLDomainName'], '//') === false ) {
 					continue;
 				}
 
 				// use object to reset domain cache as well
 				$object->LoadFromHash($site_domain);
 				$object->SetDBField('SSLDomainName', parse_url($site_domain['SSLDomainName'], PHP_URL_HOST));
 				$object->Update();
 			}
 		}
 	}
Index: branches/5.3.x/core/install/install_toolkit.php
===================================================================
--- branches/5.3.x/core/install/install_toolkit.php	(revision 16518)
+++ branches/5.3.x/core/install/install_toolkit.php	(revision 16519)
@@ -1,1029 +1,1029 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	/**
 	 * Upgrade sqls are located using this mask
 	 *
 	 */
 	define('UPGRADES_FILE', FULL_PATH.'/%sinstall/upgrades.%s');
 
 	/**
 	 * Prerequisit check classes are located using this mask
 	 *
 	 */
 	define('PREREQUISITE_FILE', FULL_PATH.'/%sinstall/prerequisites.php');
 
 	/**
 	 * Format of version identificator in upgrade files (normal, beta, release candidate)
 	 *
 	 */
 	define('VERSION_MARK', '# ===== v ([\d]+\.[\d]+\.[\d]+|[\d]+\.[\d]+\.[\d]+-B[\d]+|[\d]+\.[\d]+\.[\d]+-RC[\d]+) =====');
 
 	if (!defined('GET_LICENSE_URL')) {
 		/**
 		 * Url used for retrieving user licenses from Intechnic licensing server
 		 *
 		 */
 		define('GET_LICENSE_URL', 'http://www.in-portal.com/license.php');
 	}
 
 	/**
 	 * Misc functions, that are required during installation, when
 	 *
 	 */
 	class kInstallToolkit {
 
 		/**
 		 * Reference to kApplication class object
 		 *
 		 * @var kApplication
 		 */
 		var $Application = null;
 
 		/**
 		 * Connection to database
 		 *
 		 * @var IDBConnection
 		 */
 		var $Conn = null;
 
 		/**
 		 * System config object to access data from config.php
 		 *
 		 * @var Array
 		 */
 		public $systemConfig;
 
 		/**
 		 * Installator instance
 		 *
 		 * @var kInstallator
 		 */
 		var $_installator = null;
 
 		/**
 		 * Creates instance of kInstallToolkit class.
 		 */
 		public function __construct()
 		{
 			$this->systemConfig = new kSystemConfig(true, false);
 
 			if ( class_exists('kApplication') ) {
 				// auto-setup in case of separate module install
 				$this->Application =& kApplication::Instance();
 				$this->Application->Init(); // needed for standalone module install
 
 				$this->Conn =& $this->Application->GetADODBConnection();
 			}
 		}
 
 		/**
 		 * Sets installator
 		 *
 		 * @param kInstallator $instance
 		 */
 		function setInstallator(&$instance)
 		{
 			$this->_installator =& $instance;
 		}
 
 		/**
 		 * Checks prerequisities before module install or upgrade
 		 *
 		 * @param string $module_path
 		 * @param string $versions
 		 * @param string $mode upgrade mode = {install, standalone, upgrade}
 		 * @return bool
 		 */
 		function CheckPrerequisites($module_path, $versions, $mode)
 		{
 			if ( !$versions ) {
 				return Array ();
 			}
 
+			/** @var InPortalPrerequisites $prerequisite_object */
 			$prerequisite_object =& $this->getPrerequisiteObject($module_path);
-			/* @var $prerequisite_object InPortalPrerequisites */
 
 			// some errors possible
 			return is_object($prerequisite_object) ? $prerequisite_object->CheckPrerequisites($versions, $mode) : Array ();
 		}
 
 		/**
 		 * Call prerequisites method
 		 *
 		 * @param string $module_path
 		 * @param string $method
 		 * @return array
 		 */
 		function CallPrerequisitesMethod($module_path, $method)
 		{
+			/** @var InPortalPrerequisites $prerequisite_object */
 			$prerequisite_object =& $this->getPrerequisiteObject($module_path);
-			/* @var $prerequisite_object InPortalPrerequisites */
 
 			return is_object($prerequisite_object) ? $prerequisite_object->$method() : false;
 		}
 
 		/**
 		 * Returns prerequisite object to be used for checks
 		 *
 		 * @param string $module_path
 		 * @return kHelper
 		 * @access protected
 		 */
 		protected function &getPrerequisiteObject($module_path)
 		{
 			static $prerequisite_classes = Array ();
 
 			$prerequisites_file = sprintf(PREREQUISITE_FILE, $module_path);
 			if ( !file_exists($prerequisites_file) ) {
 				$false = false;
 
 				return $false;
 			}
 
 			if ( !isset($prerequisite_classes[$module_path]) ) {
 				// save class name, because 2nd time
 				// (in after call $prerequisite_class variable will not be present)
 				include_once $prerequisites_file;
 				$prerequisite_classes[$module_path] = $prerequisite_class;
 			}
 
+			/** @var InPortalPrerequisites $prerequisite_object */
 			$prerequisite_object = new $prerequisite_classes[$module_path]();
-			/* @var $prerequisite_object InPortalPrerequisites */
 
 			if ( method_exists($prerequisite_object, 'setToolkit') ) {
 				$prerequisite_object->setToolkit($this);
 			}
 
 			return $prerequisite_object;
 		}
 
 		/**
 		 * Processes one license, received from server
 		 *
 		 * @param string $file_data
 		 */
 		function processLicense($file_data)
 		{
+			/** @var kModulesHelper $modules_helper */
 			$modules_helper = $this->Application->recallObject('kModulesHelper');
-			/* @var $modules_helper kModulesHelper */
 
 			$file_data = explode('Code==:', $file_data);
 			$file_data[0] = str_replace('In-Portal License File - do not edit!' . "\n", '', $file_data[0]);
 			$file_data = array_map('trim', $file_data);
 
 			if ($modules_helper->verifyLicense($file_data[0])) {
 				$this->systemConfig->set('License', 'Intechnic', $file_data[0]);
 				if (array_key_exists(1, $file_data)) {
 					$this->systemConfig->set('LicenseCode', 'Intechnic', $file_data[1]);
 				}
 				else {
 					$this->systemConfig->set('LicenseCode', 'Intechnic');
 				}
 				$this->systemConfig->save();
 			}
 			else {
 				// invalid license received from licensing server
 				$this->_installator->errorMessage = 'Invalid License File';
 			}
 		}
 
 		/**
 		 * Saves given configuration values to database
 		 *
 		 * @param Array $config
 		 */
 		function saveConfigValues($config)
 		{
 			foreach ($config as $config_var => $value) {
 				$sql = 'UPDATE ' . TABLE_PREFIX . 'SystemSettings
 						SET VariableValue = ' . $this->Conn->qstr($value) . '
 						WHERE VariableName = ' . $this->Conn->qstr($config_var);
 				$this->Conn->Query($sql);
 			}
 		}
 
 		/**
 		 * Sets module version to passed
 		 *
 		 * @param string $module_name
 		 * @param string|bool $module_path
 		 * @param string|bool $version
 		 */
 		function SetModuleVersion($module_name, $module_path = false, $version = false)
 		{
 			if ($version === false) {
 				if (!$module_path) {
 					throw new Exception('Module path must be given to "SetModuleVersion" method to auto-detect version');
 				}
 
 				$version = $this->GetMaxModuleVersion($module_path);
 			}
 
 			// get table prefix from config, because application may not be available here
 			$table_prefix = $this->systemConfig->get('TablePrefix', 'Database');
 
 			if ($module_name == 'kernel') {
 				$module_name = 'in-portal';
 			}
 
 			$sql = 'UPDATE ' . $table_prefix . 'Modules
 					SET Version = "' . $version . '", BuildDate = ' . time() . '
 					WHERE LOWER(Name) = "' . strtolower($module_name) . '"';
 			$this->Conn->Query($sql);
 		}
 
 		/**
 		 * Sets module root category to passed
 		 *
 		 * @param string $module_name
 		 * @param int $category_id
 		 */
 		function SetModuleRootCategory($module_name, $category_id = 0)
 		{
 			// get table prefix from config, because application may not be available here
 			$table_prefix = $this->systemConfig->get('TablePrefix', 'Database');
 
 			if ($module_name == 'kernel') {
 				$module_name = 'in-portal';
 			}
 
 			$sql = 'UPDATE ' . $table_prefix . 'Modules
 					SET RootCat = ' . $category_id . '
 					WHERE LOWER(Name) = "' . strtolower($module_name) . '"';
 			$this->Conn->Query($sql);
 		}
 
 		/**
 		 * Returns maximal version of given module by scanning it's upgrade scripts
 		 *
 		 * @param string $module_path
 		 * @return string
 		 */
 		function GetMaxModuleVersion($module_path)
 		{
 			$module_path = rtrim(mb_strtolower($module_path), '/');
 			$upgrades_file = sprintf(UPGRADES_FILE, $module_path . '/', 'sql');
 
 			if (!file_exists($upgrades_file)) {
 				// no upgrade file
 				return '5.0.0';
 			}
 
 			$sqls = file_get_contents($upgrades_file);
 			$versions_found = preg_match_all('/'.VERSION_MARK.'/s', $sqls, $regs);
 			if (!$versions_found) {
 				// upgrades file doesn't contain version definitions
 				return '5.0.0';
 			}
 
 			return end($regs[1]);
 		}
 
 		/**
 		 * Runs SQLs from file
 		 *
 		 * @param string $filename
 		 * @param mixed $replace_from
 		 * @param mixed $replace_to
 		 */
 		function RunSQL($filename, $replace_from = null, $replace_to = null)
 		{
 			if (!file_exists(FULL_PATH.$filename)) {
 				return ;
 			}
 
 			$sqls = file_get_contents(FULL_PATH.$filename);
 			if (!$this->RunSQLText($sqls, $replace_from, $replace_to)) {
 				if (is_object($this->_installator)) {
 					$this->_installator->Done();
 				}
 				else {
 					if (isset($this->Application)) {
 						$this->Application->Done();
 					}
 
 					exit;
 				}
 			}
 		}
 
 		/**
 		 * Runs SQLs from string
 		 *
 		 * @param string $sqls
 		 * @param mixed $replace_from
 		 * @param mixed $replace_to
 		 * @param int $start_from
 		 * @return bool
 		 */
 		function RunSQLText(&$sqls, $replace_from = null, $replace_to = null, $start_from = 0)
 		{
 			$table_prefix = $this->systemConfig->get('TablePrefix', 'Database');
 
 			// add prefix to all tables
 			if (strlen($table_prefix) > 0) {
 				$replacements = Array ('INSERT INTO ', 'UPDATE ', 'ALTER TABLE ', 'DELETE FROM ', 'REPLACE INTO ');
 
 				foreach ($replacements as $replacement) {
 					$sqls = str_replace($replacement, $replacement . $table_prefix, $sqls);
 				}
 			}
 
 			$sqls = str_replace('CREATE TABLE ', 'CREATE TABLE IF NOT EXISTS ' . $table_prefix, $sqls);
 			$sqls = str_replace('DROP TABLE ', 'DROP TABLE IF EXISTS ' . $table_prefix, $sqls);
 			$sqls = str_replace('<%TABLE_PREFIX%>', $table_prefix, $sqls);
 
 			$primary_language = is_object($this->Application) ? $this->Application->GetDefaultLanguageId() : 1;
 			$sqls = str_replace('<%PRIMARY_LANGUAGE%>', $primary_language, $sqls);
 
 			if (isset($replace_from) && isset($replace_to)) {
 				// replace something additionally, e.g. module root category
 				$sqls = str_replace($replace_from, $replace_to, $sqls);
 			}
 
 			$sqls = str_replace("\r\n", "\n", $sqls);  // convert to linux line endings
 			$no_comment_sqls = preg_replace("/#\s([^;]*?)\n/is", '', $sqls); // remove all comments "#" on new lines
 
 			if ($no_comment_sqls === null) {
 				// "ini.pcre.backtrack-limit" reached and error happened
 				$sqls = explode(";\n", $sqls . "\n"); // ensures that last sql won't have ";" in it
 				$sqls = array_map('trim', $sqls);
 
 				// remove all comments "#" on new lines (takes about 2 seconds for 53000 sqls)
 				$sqls = preg_replace("/#\s([^;]*?)/", '', $sqls);
 			}
 			else {
 				$sqls = explode(";\n", $no_comment_sqls . "\n"); // ensures that last sql won't have ";" in it
 				$sqls = array_map('trim', $sqls);
 			}
 
 			$sql_count = count($sqls);
 			$db_collation = $this->systemConfig->get('DBCollation', 'Database');
 
 			for ($i = $start_from; $i < $sql_count; $i++) {
 				$sql = $sqls[$i];
 				if (!$sql || (substr($sql, 0, 1) == '#')) {
 					continue; // usually last line
 				}
 
 				if (substr($sql, 0, 13) == 'CREATE TABLE ' && $db_collation) {
 					// it is CREATE TABLE statement -> add collation
 					$sql .= ' COLLATE \'' . $db_collation . '\'';
 				}
 
 				$this->Conn->Query($sql);
 				if ($this->Conn->getErrorCode() != 0) {
 					if (is_object($this->_installator)) {
 		  				$this->_installator->errorMessage = 'Error: ('.$this->Conn->getErrorCode().') '.$this->Conn->getErrorMsg().'<br /><br />Last Database Query:<br /><textarea cols="70" rows="10" readonly>'.htmlspecialchars($sql, ENT_QUOTES, 'UTF-8').'</textarea>';
 		  				$this->_installator->LastQueryNum = $i + 1;
 					}
 	  				return false;
 	    		}
 			}
 			return true;
 		}
 
 		/**
 		 * Performs clean language import from given xml file
 		 *
 		 * @param string $lang_file
 		 * @param bool $upgrade
 		 * @todo Import for "core/install/english.lang" (322KB) takes 18 seconds to work on Windows
 		 */
 		function ImportLanguage($lang_file, $upgrade = false)
 		{
 			$lang_file = FULL_PATH.$lang_file.'.lang';
 			if (!file_exists($lang_file)) {
 				return ;
 			}
 
+			/** @var LanguageImportHelper $language_import_helper */
 			$language_import_helper = $this->Application->recallObject('LanguageImportHelper');
-			/* @var $language_import_helper LanguageImportHelper */
 
 			if ( !$upgrade ) {
 				$language_import_helper->setOption(LanguageImportHelper::OVERWRITE_EXISTING);
 			}
 
 			$language_import_helper->performImport($lang_file, '|0|1|2|', '');
 		}
 
 		/**
 		 * Converts module version in format X.Y.Z[-BN/-RCM] to signle integer
 		 *
 		 * @param string $version
 		 * @return int
 		 */
 		function ConvertModuleVersion($version)
 		{
 			if (preg_match('/(.*)-(B|RC)([\d]+)/', $version, $regs)) {
 				// -B<M> or RC-<N>
 				$parts = explode('.', $regs[1]);
 
 				$parts[] = $regs[2] == 'B' ? 1 : 2; // B reliases goes before RC releases
 				$parts[] = $regs[3];
 			}
 			else {
 				// releases without B/RC marks go after any B/RC releases
 				$parts = explode('.', $version . '.3.100');
 			}
 
 			$bin = '';
 
 			foreach ($parts as $part_index => $part) {
 				if ($part_index == 3) {
 					// version type only can be 1/2/3 (11 in binary form), so don't use padding at all
 					$pad_count = 2;
 				}
 				else {
 					$pad_count = 8;
 				}
 
 				$bin .= str_pad(decbin($part), $pad_count, '0', STR_PAD_LEFT);
 			}
 
 			return bindec($bin);
 		}
 
 		/**
 		 * Returns themes, found in system
 		 *
 		 * @param bool $rebuild
 		 * @return int
 		 */
 		function getThemes($rebuild = false)
 		{
 			if ($rebuild) {
 				$this->rebuildThemes();
 			}
 
 			$theme_config = $this->Application->getUnitConfig('theme');
 			$id_field = $theme_config->getIDField();
 
 			$sql = 'SELECT Name, ' . $id_field . '
 					FROM ' . $theme_config->getTableName() . '
 					ORDER BY Name ASC';
 
 			return $this->Conn->GetCol($sql, $id_field);
 		}
 
 		/**
 		 * Checks if system config is present and is not empty
 		 *
 		 * @return bool
 		 */
 		function systemConfigFound()
 		{
 			return $this->systemConfig->exists();
 		}
 
 		/**
 		 * Checks if given section is present in config
 		 *
 		 * @param string $section
 		 * @return bool
 		 */
 		function sectionFound($section)
 		{
 			return $this->systemConfig->sectionFound($section);
 		}
 
 		/**
 		 * Returns formatted module name based on it's root folder
 		 *
 		 * @param string $module_folder
 		 * @return string
 		 */
 		function getModuleName($module_folder)
 		{
 			return implode('-', array_map('ucfirst', explode('-', $module_folder)));
 		}
 
 		/**
 		 * Returns information about module (based on "install/module_info.xml" file)
 		 *
 		 * @param string $module_name
 		 * @return Array
 		 */
 		function getModuleInfo($module_name)
 		{
 			if ( $module_name == 'core' ) {
 				$info_file = FULL_PATH . '/' . $module_name . '/install/module_info.xml';
 			}
 			else {
 				$info_file = MODULES_PATH . '/' . $module_name . '/install/module_info.xml';
 			}
 
 			if ( !file_exists($info_file) ) {
 				return Array ();
 			}
 
 			$ret = Array ();
+			/** @var SimpleXMLElement[] $module_info */
 			$module_info = simplexml_load_file($info_file);
 
 			if ( $module_info === false ) {
 				// non-valid xml file
 				return Array ();
 			}
 
 			foreach ($module_info as $node) {
-				/* @var $node SimpleXMLElement */
 				$ret[strtolower($node->getName())] = trim($node);
 			}
 
 			return $ret;
 		}
 
 		/**
 		 * Returns nice module string to be used on install/upgrade screens
 		 *
 		 * @param string $module_name
 		 * @param string $version_string
 		 * @return string
 		 */
 		function getModuleString($module_name, $version_string)
 		{
 			// image (if exists) <description> (<name> <version>)
 
 			$ret = Array ();
 			$module_info = $this->getModuleInfo($module_name);
 
 			if (array_key_exists('name', $module_info) && $module_info['name']) {
 				$module_name = $module_info['name'];
 			}
 			else {
 				$module_name = $this->getModuleName($module_name);
 			}
 
 			if (array_key_exists('image', $module_info) && $module_info['image']) {
 				$image_src = $module_info['image'];
 
 				if (!preg_match('/^(http|https):\/\//', $image_src)) {
 					// local image -> make absolute url
 					$image_src = $this->Application->BaseURL() . $image_src;
 				}
 
 				$ret[] = '<img src="' . $image_src . '" alt="' . htmlspecialchars($module_name, ENT_QUOTES, 'UTF-8') . '" title="' . htmlspecialchars($module_name, ENT_QUOTES, 'UTF-8') . '" style="vertical-align:middle; margin: 3px 0 3px 5px"/>';
 			}
 
 			if (array_key_exists('description', $module_info) && $module_info['description']) {
 				$ret[] = $module_info['description'];
 			}
 			else {
 				$ret[] = $module_name;
 			}
 
 			$ret[] = '(' . $module_name . ' ' . $version_string . ')';
 
 			return implode(' ', $ret);
 		}
 
 		/**
 		 * Creates module root category in "Home" category using given data and returns it
 		 *
 		 * @param string $name
 		 * @param string $description
 		 * @param string $category_template
 		 * @param string $category_icon
 		 * @return kDBItem
 		 */
 		function &createModuleCategory($name, $description, $category_template = null, $category_icon = null)
 		{
 			static $fields = null;
 
 			if ( !isset($fields) ) {
+				/** @var kMultiLanguage $ml_formatter */
 				$ml_formatter = $this->Application->recallObject('kMultiLanguage');
-				/* @var $ml_formatter kMultiLanguage */
 
 				$fields['name'] = $ml_formatter->LangFieldName('Name');
 				$fields['description'] = $ml_formatter->LangFieldName('Description');
 			}
 
+			/** @var kDBItem $category */
 			$category = $this->Application->recallObject('c', null, Array ('skip_autoload' => true));
-			/* @var $category kDBItem */
 
 			$category_fields = Array (
 				$fields['name'] => $name, 'Filename' => $name, 'AutomaticFilename' => 1,
 				$fields['description'] => $description, 'Status' => STATUS_ACTIVE, 'Priority' => -9999,
 
 				// prevents empty link to module category on spearate module install
 				'NamedParentPath' => 'Content/' . $name,
 			);
 
 			$category_fields['ParentId'] = $this->Application->getBaseCategory();
 
 			if ( isset($category_template) ) {
 				$category_fields['Template'] = $category_template;
 				$category_fields['CachedTemplate'] = $category_template;
 			}
 
 			if ( isset($category_icon) ) {
 				$category_fields['UseMenuIconUrl'] = 1;
 				$category_fields['MenuIconUrl'] = $category_icon;
 			}
 
 			$category->Clear();
 			$category->SetDBFieldsFromHash($category_fields);
 
 			$category->Create();
 
+			/** @var kPriorityHelper $priority_helper */
 			$priority_helper = $this->Application->recallObject('PriorityHelper');
-			/* @var $priority_helper kPriorityHelper */
 
 			$event = new kEvent('c:OnListBuild');
 
 			// ensure, that newly created category has proper value in Priority field
 			$priority_helper->recalculatePriorities($event, 'ParentId = ' . $category_fields['ParentId']);
 
 			// update Priority field in object, becase "CategoriesItem::Update" method will be called
 			// from "kInstallToolkit::setModuleItemTemplate" and otherwise will set 0 to Priority field
 			$sql = 'SELECT Priority
 					FROM ' . $category->TableName . '
 					WHERE ' . $category->IDField . ' = ' . $category->GetID();
 			$category->SetDBField('Priority', $this->Conn->GetOne($sql));
 
 			return $category;
 		}
 
 		/**
 		 * Sets category item template into custom field for given prefix
 		 *
 		 * @param kDBItem $category
 		 * @param string $prefix
 		 * @param string $item_template
 		 */
 		function setModuleItemTemplate(&$category, $prefix, $item_template)
 		{
 			$this->Application->removeObject('c-cdata');
 
 			// recreate all fields, because custom fields are added during install script
 			$category->Configure();
 
 			$category->SetDBField('cust_' . $prefix  .'_ItemTemplate', $item_template);
 			$category->Update();
 		}
 
 		/**
 		 * Link custom field records with search config records + create custom field columns
 		 *
 		 * @param string $module_folder
 		 * @param string $prefix
 		 * @param int $item_type
 		 */
 		function linkCustomFields($module_folder, $prefix, $item_type)
 		{
 			$module_folder = strtolower($module_folder);
 			$module_name = $module_folder;
 
 			if ( $module_folder == 'kernel' ) {
 				$module_name = 'in-portal';
 				$module_folder = 'core';
 			}
 
 			$db =& $this->Application->GetADODBConnection();
 
 			$sql = 'SELECT FieldName, CustomFieldId
 					FROM ' . TABLE_PREFIX . 'CustomFields
 					WHERE Type = ' . $item_type . ' AND IsSystem = 0'; // config is not read here yet :( $this->Application->getUnitConfig('p')->getItemType();
 			$custom_fields = $db->GetCol($sql, 'CustomFieldId');
 
 			foreach ($custom_fields as $cf_id => $cf_name) {
 				$sql = 'UPDATE ' . TABLE_PREFIX . 'SearchConfig
 						SET CustomFieldId = ' . $cf_id . '
 						WHERE (TableName = "CustomFields") AND (LOWER(ModuleName) = "' . $module_name . '") AND (FieldName = ' . $db->qstr($cf_name) . ')';
 				$db->Query($sql);
 			}
 
 			// because of configs was read only from installed before modules (in-portal), then reread configs
 			$this->Application->UnitConfigReader->scanModules(MODULES_PATH . DIRECTORY_SEPARATOR . $module_folder);
 
 			// create correct columns in CustomData table
+			/** @var kMultiLanguageHelper $ml_helper */
 			$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
-			/* @var $ml_helper kMultiLanguageHelper */
 
 			$ml_helper->createFields($prefix . '-cdata', true);
 		}
 
 		/**
 		 * Deletes cache, useful after separate module install and installator last step
 		 *
 		 * @param bool $refresh_permissions
 		 * @return void
 		 */
 		function deleteCache($refresh_permissions = false)
 		{
 			$this->Application->HandleEvent(new kEvent('adm:OnResetMemcache')); // not in DB = 100% invalidate
 			$this->Application->HandleEvent(new kEvent('adm:OnResetConfigsCache'));
 			$this->Application->HandleEvent(new kEvent('adm:OnResetSections'));
 			$this->Application->HandleEvent(new kEvent('c:OnResetCMSMenuCache'));
 
 			$this->Conn->Query('DELETE FROM ' . TABLE_PREFIX . 'CachedUrls');
 
 			if ( $refresh_permissions ) {
 				$rebuild_mode = $this->Application->ConfigValue('CategoryPermissionRebuildMode');
 
 				if ( $rebuild_mode == CategoryPermissionRebuild::SILENT ) {
 					// refresh permission without progress bar
+					/** @var kPermCacheUpdater $updater */
 					$updater = $this->Application->makeClass('kPermCacheUpdater');
-					/* @var $updater kPermCacheUpdater */
 
 					$updater->OneStepRun();
 				}
 				elseif ( $rebuild_mode == CategoryPermissionRebuild::AUTOMATIC ) {
 					// refresh permissions with ajax progress bar (when available)
 					$this->Application->setDBCache('ForcePermCacheUpdate', 1);
 				}
 			}
 		}
 
 		/**
 		 * Deletes all temp tables (from active sessions too)
 		 *
 		 */
 		function deleteEditTables()
 		{
 			$table_prefix = $this->systemConfig->get('TablePrefix', 'Database');
 
 			$tables = $this->Conn->GetCol('SHOW TABLES');
 			$mask_edit_table = '/' . $table_prefix . 'ses_(.*)_edit_(.*)/';
 			$mask_search_table = '/' . $table_prefix . 'ses_(.*?)_(.*)/';
 
 			foreach ($tables as $table) {
 				if ( preg_match($mask_edit_table, $table, $rets) || preg_match($mask_search_table, $table, $rets) ) {
 					$this->Conn->Query('DROP TABLE IF EXISTS ' . $table);
 				}
 			}
 		}
 
 		/**
 		 * Perform redirect after separate module install
 		 *
 		 * @param string $module_folder
 		 * @param bool $refresh_permissions
 		 */
 		function finalizeModuleInstall($module_folder, $refresh_permissions = false)
 		{
 			$this->SetModuleVersion(basename($module_folder), $module_folder);
 
 			if (!$this->Application->GetVar('redirect')) {
 				return ;
 			}
 
+			/** @var kThemesHelper $themes_helper */
 			$themes_helper = $this->Application->recallObject('ThemesHelper');
-			/* @var $themes_helper kThemesHelper */
 
 			// use direct query, since module isn't yet in kApplication::ModuleInfo array
 			$sql = 'SELECT Name
 					FROM ' . TABLE_PREFIX . 'Modules
 					WHERE Path = ' . $this->Conn->qstr(rtrim($module_folder, '/') . '/');
 			$module_name = $this->Conn->GetOne($sql);
 
 			$themes_helper->synchronizeModule($module_name);
 
+			/** @var kMultiLanguageHelper $ml_helper */
 			$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
-			/* @var $ml_helper kMultiLanguageHelper */
 
 			$ml_helper->massCreateFields();
 
 			$this->deleteCache($refresh_permissions);
 
 			$url_params = Array (
 				'pass' => 'm', 'admin' => 1,
 				'RefreshTree' => 1, 'index_file' => 'index.php',
 			);
 			$this->Application->Redirect('modules/modules_list', $url_params);
 		}
 
 		/**
 		 * Performs rebuild of themes
 		 *
 		 */
 		function rebuildThemes()
 		{
 			$this->Application->HandleEvent(new kEvent('adm:OnRebuildThemes'));
 		}
 
 		/**
 		 * Checks that file is writable by group or others
 		 *
 		 * @param string $file
 		 * @return boolean
 		 */
 		function checkWritePermissions($file)
 		{
 			if (DIRECTORY_SEPARATOR == '\\') {
 				// windows doen't allow to check permissions (always returns null)
 				return null;
 			}
 
 			$permissions = fileperms($file);
 			return $permissions & 0x0010 || $permissions & 0x0002;
 		}
 
 		/**
 		 * Upgrades primary skin to the latest version
 		 *
 		 * @param Array $module_info
 		 * @return string|bool
 		 */
 		function upgradeSkin($module_info)
 		{
 			$upgrades_file = sprintf(UPGRADES_FILE, $module_info['Path'], 'css');
 			$data = file_get_contents($upgrades_file);
 
 			// get all versions with their positions in file
 			$versions = Array ();
 			preg_match_all('/(' . VERSION_MARK . ')/s', $data, $matches, PREG_SET_ORDER + PREG_OFFSET_CAPTURE);
 			$from_version_int = $this->ConvertModuleVersion($module_info['FromVersion']);
 
 			foreach ($matches as $index => $match) {
 				$version_int = $this->ConvertModuleVersion($match[2][0]);
 
 				if ( $version_int < $from_version_int ) {
 					// only process versions, that were released after currently used version
 					continue;
 				}
 
 				$start_pos = $match[0][1] + strlen($match[0][0]);
 				$end_pos = array_key_exists($index + 1, $matches) ? $matches[$index + 1][0][1] : mb_strlen($data);
 				$patch_data = str_replace("\r\n", "\n", substr($data, $start_pos, $end_pos - $start_pos));
 
 				$versions[] = Array (
 					'Version' => $match[2][0],
 					// fixes trimmed leading spaces by modern text editor
 					'Data' => ltrim( str_replace("\n\n", "\n \n", $patch_data) ),
 				);
 			}
 
 			if ( !$versions ) {
 				// not skin changes -> quit
 				return true;
 			}
 
+			/** @var kDBItem $primary_skin */
 			$primary_skin = $this->Application->recallObject('skin.primary', null, Array ('skip_autoload' => true));
-			/* @var $primary_skin kDBItem */
 
 			$primary_skin->Load(1, 'IsPrimary');
 
 			if ( !$primary_skin->isLoaded() ) {
 				// we always got primary skin, but just in case
 				return false;
 			}
 
+			/** @var kTempTablesHandler $temp_handler */
 			$temp_handler = $this->Application->recallObject('skin_TempHandler', 'kTempTablesHandler');
-			/* @var $temp_handler kTempTablesHandler */
 
 			// clone current skin
 			$cloned_ids = $temp_handler->CloneItems('skin', '', Array ($primary_skin->GetID()));
 
 			if ( !$cloned_ids ) {
 				// can't clone
 				return false;
 			}
 
+			/** @var kDBItem $skin */
 			$skin = $this->Application->recallObject('skin.tmp', null, Array ('skip_autoload' => true));
-			/* @var $skin kDBItem */
 
 			$skin->Load($cloned_ids[0]);
 
 			// save css to temp file (for patching)
 			$skin_file = tempnam('/tmp', 'skin_css_');
 			$fp = fopen($skin_file, 'w');
 			fwrite($fp, str_replace("\r\n", "\n", $skin->GetDBField('CSS')));
 			fclose($fp);
 
 			$output = Array ();
 			$patch_file = tempnam('/tmp', 'skin_patch_');
 
 			foreach ($versions as $version_info) {
 				// for each left version get it's patch and apply to temp file
 				$fp = fopen($patch_file, 'w');
 				fwrite($fp, $version_info['Data']);
 				fclose($fp);
 
 				$output[ $version_info['Version'] ] = shell_exec('patch ' . $skin_file . ' ' . $patch_file . ' 2>&1') . "\n";
 			}
 
 			// place temp file content into cloned skin
 			$skin->SetDBField('Name', 'Upgraded to ' . $module_info['ToVersion']);
 			$skin->SetDBField('CSS', file_get_contents($skin_file));
 			$skin->Update();
 
 			unlink($skin_file);
 			unlink($patch_file);
 
 			$has_errors = false;
 
 			foreach ($output as $version => $version_output) {
 				$version_errors = trim(preg_replace("/(^|\n)(patching file .*?|Hunk #.*?\.)(\n|$)/m", '', $version_output));
 
 				if ( $version_errors ) {
 					$has_errors = true;
 					$output[$version] = trim(preg_replace("/(^|\n)(patching file .*?)(\n|$)/m", '', $output[$version]));
 				}
 				else {
 					unset($output[$version]);
 				}
 			}
 
 			if ( !$has_errors ) {
 				// copy patched css back to primary skin
 				$primary_skin->SetDBField('CSS', $skin->GetDBField('CSS'));
 				$primary_skin->Update();
 
 				// delete temporary skin record
 				$temp_handler->DeleteItems('skin', '', Array ($skin->GetID()));
 
 				return true;
 			}
 
 			// put clean skin from new version
 			$skin->SetDBField('CSS', file_get_contents(FULL_PATH . '/core/admin_templates/incs/style_template.css'));
 			$skin->Update();
 
 			// return output in case of errors
 			return $output;
 		}
 
 		/**
 		 * Returns cache handlers, that are working
 		 *
 		 * @param string $current
 		 * @return Array
 		 */
 		public function getWorkingCacheHandlers($current = null)
 		{
 			if ( !isset($current) ) {
 				$current = $this->systemConfig->get('CacheHandler', 'Misc');
 			}
 
 			$cache_handler = $this->Application->makeClass('kCache');
 
 			$cache_handlers = Array (
 				'Fake' => 'None', 'Memcache' => 'Memcached', 'XCache' => 'XCache', 'Apc' => 'Alternative PHP Cache'
 			);
 
 			foreach ($cache_handlers AS $class_prefix => $title) {
 				$handler_class = $class_prefix . 'CacheHandler';
 
 				if ( !class_exists($handler_class) ) {
 					unset($cache_handlers[$class_prefix]);
 				}
 				else {
+					/** @var FakeCacheHandler $handler */
 					$handler = new $handler_class($cache_handler, 'localhost:11211');
-					/* @var $handler FakeCacheHandler */
 
 					if ( !$handler->isWorking() ) {
 						if ( $current == $class_prefix ) {
 							$cache_handlers[$class_prefix] .= ' (offline)';
 						}
 						else {
 							unset($cache_handlers[$class_prefix]);
 						}
 					}
 				}
 			}
 
 			return $cache_handlers;
 		}
 
 		/**
 		 * Returns compression engines, that are working
 		 *
 		 * @param string $current
 		 * @return Array
 		 */
 		public function getWorkingCompressionEngines($current = null)
 		{
 			if ( !isset($current) ) {
 				$current = $this->systemConfig->get('CompressionEngine', 'Misc');
 			}
 
 			$output = shell_exec('java -version 2>&1');
 			$compression_engines = Array ('' => 'None', 'yui' => 'YUICompressor (Java)', 'php' => 'PHP-based');
 
 			if ( stripos($output, 'java version') === false ) {
 				if ( $current == 'yui' ) {
 					$compression_engines['yui'] .= ' (offline)';
 				}
 				else {
 					unset($compression_engines['yui']);
 				}
 			}
 
 			return $compression_engines;
 		}
 	}
Index: branches/5.3.x/core/install/upgrade_helper.php
===================================================================
--- branches/5.3.x/core/install/upgrade_helper.php	(revision 16518)
+++ branches/5.3.x/core/install/upgrade_helper.php	(revision 16519)
@@ -1,66 +1,66 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2010 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 	defined('FULL_PATH') or die('restricted access!');
 
 	class kUpgradeHelper extends kHelper {
 
 		/**
 		 * Install toolkit instance
 		 *
 		 * @var kInstallToolkit
 		 */
 		var $_toolkit = null;
 
 		/**
 		 * List of dependencies for EACH current module version related to other modules
 		 *
 		 * @var Array
 		 */
 		var $dependencies = Array ();
 
 		/**
 		 * Sets common instance of installator toolkit
 		 *
 		 * @param kInstallToolkit $instance
 		 */
 		function setToolkit(&$instance)
 		{
 			$this->_toolkit =& $instance;
 		}
 
 		/**
 		 * Replaces deprecated detail template design with new one
 		 *
 		 * @param string $prefix
 		 * @param string $from_template
 		 * @param string $to_template
 		 */
 		function _updateDetailTemplate($prefix, $from_template, $to_template)
 		{
 			$sql = 'SELECT CustomFieldId
 					FROM ' . TABLE_PREFIX . 'CustomField
 					WHERE FieldName = "' . $prefix . '_ItemTemplate"';
 			$custom_field_id = $this->Conn->GetOne($sql);
 
+			/** @var kMultiLanguage $ml_formatter */
 			$ml_formatter = $this->Application->recallObject('kMultiLanguage');
-			/* @var $ml_formatter kMultiLanguage */
 
 			$field = $ml_formatter->LangFieldName('cust_' . $custom_field_id, true);
 
 			$sql = 'UPDATE ' . TABLE_PREFIX . 'CategoryCustomData
 					SET ' . $field . ' = "' . $to_template . '"
 					WHERE ' . $field . ' = "' . $from_template . '"';
 			$this->Conn->Query($sql);
 		}
 	}
Index: branches/5.3.x/core/install.php
===================================================================
--- branches/5.3.x/core/install.php	(revision 16518)
+++ branches/5.3.x/core/install.php	(revision 16519)
@@ -1,1777 +1,1777 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 	ini_set('display_errors', 1);
 	error_reporting(E_ALL & ~E_STRICT);
 
 	define('IS_INSTALL', 1);
 	define('ADMIN', 1);
 	define('FULL_PATH', realpath(dirname(__FILE__).'/..') );
 	define('REL_PATH', '/core');
 
 	// run installator
 	$install_engine = new kInstallator();
 	$install_engine->Init();
 	$install_engine->Run();
 	$install_engine->Done();
 
 	class kInstallator {
 
 		/**
 		 * Reference to kApplication class object
 		 *
 		 * @var kApplication
 		 */
 		var $Application = null;
 
 		/**
 		 * Connection to database
 		 *
 		 * @var IDBConnection
 		 */
 		var $Conn = null;
 
 		/**
 		 * XML file containing steps information
 		 *
 		 * @var string
 		 */
 		var $StepDBFile = '';
 
 		/**
 		 * Step name, that currently being processed
 		 *
 		 * @var string
 		 */
 		var $currentStep = '';
 
 		/**
 		 * Steps list (preset) to use for current installation
 		 *
 		 * @var string
 		 */
 		var $stepsPreset = '';
 
 		/**
 		 * Installation steps to be done
 		 *
 		 * @var Array
 		 */
 		var $steps = Array (
 			'fresh_install'		=>	Array ('sys_requirements', 'check_paths', 'db_config', 'select_license', /*'download_license',*/ 'select_domain', 'root_password', 'choose_modules', 'post_config', 'sys_config', 'select_theme', 'security', 'finish'),
 			'clean_reinstall'	=>	Array ('install_setup', 'sys_requirements', 'check_paths', 'clean_db', 'db_config', 'select_license', /*'download_license',*/ 'select_domain', 'root_password', 'choose_modules', 'post_config', 'sys_config', 'select_theme', 'security', 'finish'),
 			'already_installed'	=>	Array ('check_paths', 'install_setup'),
 
 			'upgrade'			=>	Array ('check_paths', 'install_setup', 'sys_config', 'upgrade_modules', 'skin_upgrade', 'security', 'finish'),
 			'update_license'	=>	Array ('check_paths', 'install_setup', 'select_license', /*'download_license',*/ 'select_domain', 'security', 'finish'),
 			'update_config'		=>	Array ('check_paths', 'install_setup', 'sys_config', 'security', 'finish'),
 			'db_reconfig'		=>	Array ('check_paths', 'install_setup', 'db_reconfig', 'security', 'finish'),
 			'sys_requirements'	=>	Array ('check_paths', 'install_setup', 'sys_requirements', 'security', 'finish')
 		);
 
 		/**
 		 * Steps, that doesn't required admin to be logged-in to proceed
 		 *
 		 * @var Array
 		 */
 		var $skipLoginSteps = Array ('sys_requirements', 'check_paths', 'select_license', /*'download_license',*/ 'select_domain', 'root_password', 'choose_modules', 'post_config', 'select_theme', 'security', 'finish', -1);
 
 		/**
 		 * Steps, on which kApplication should not be initialized, because of missing correct db table structure
 		 *
 		 * @var Array
 		 */
 		var $skipApplicationSteps = Array ('sys_requirements', 'check_paths', 'clean_db', 'db_config', 'db_reconfig' /*, 'install_setup'*/); // remove install_setup when application will work separately from install
 
 		/**
 		 * Folders that should be writeable to continue installation. $1 - main writeable folder from config.php ("/system" by default)
 		 *
 		 * @var Array
 		 */
 		var $writeableFolders = Array (
 			'$1',
 			'$1/.restricted',
 			'$1/images',
 			'$1/images/pending',
 			'$1/images/emoticons', // for "In-Bulletin"
 			'$1/user_files',
 			'$1/cache',
 		);
 
 		/**
 		 * Contains last error message text
 		 *
 		 * @var string
 		 */
 		var $errorMessage = '';
 
 		/**
 		 * Base path for includes in templates
 		 *
 		 * @var string
 		 */
 		var $baseURL = '';
 
 		/**
 		 * Holds number of last executed query in the SQL
 		 *
 		 * @var int
 		 */
 		var $LastQueryNum = 0;
 
 		/**
 		 * Dependencies, that should be used in upgrade process
 		 *
 		 * @var Array
 		 */
 		var $upgradeDepencies = Array ();
 
 		/**
 		 * Log of upgrade - list of upgraded modules and their versions
 		 *
 		 * @var Array
 		 */
 		var $upgradeLog = Array ();
 
 		/**
 		 * Common tools required for installation process
 		 *
 		 * @var kInstallToolkit
 		 */
 		var $toolkit = null;
 
 		function Init()
 		{
 			include_once(FULL_PATH . REL_PATH . '/kernel/kbase.php'); // required by kDBConnection class
 			include_once(FULL_PATH . REL_PATH . '/kernel/utility/multibyte.php');	// emulating multi-byte php extension
 			include_once(FULL_PATH . REL_PATH . '/kernel/utility/system_config.php');
 			require_once(FULL_PATH . REL_PATH . '/install/install_toolkit.php'); // toolkit required for module installations to installator
 
 			$this->toolkit = new kInstallToolkit();
 			$this->toolkit->setInstallator($this);
 			$this->StepDBFile = FULL_PATH.'/'.REL_PATH.'/install/steps_db.xml';
 			$this->baseURL = 'http://' . $_SERVER['HTTP_HOST'] . $this->toolkit->systemConfig->get('WebsitePath', 'Misc') . '/core/install/';
 			set_error_handler( Array(&$this, 'ErrorHandler') );
 
 			if ( $this->toolkit->systemConfigFound() ) {
 				// if config.php found, then check his write permission too
 				$this->writeableFolders[] = $this->toolkit->systemConfig->get('WriteablePath', 'Misc') . '/config.php';
 			}
 
 			$this->currentStep = $this->GetVar('step');
 
 			// can't check login on steps where no application present anyways :)
 			$this->skipLoginSteps = array_unique(array_merge($this->skipLoginSteps, $this->skipApplicationSteps));
 
 			$this->SelectPreset();
 
 			if (!$this->currentStep) {
 				$this->SetFirstStep(); // sets first step of current preset
 			}
 
 			$this->InitStep();
 		}
 
 		function SetFirstStep()
 		{
 			reset($this->steps[$this->stepsPreset]);
 			$this->currentStep = current($this->steps[$this->stepsPreset]);
 		}
 
 		/**
 		 * Selects preset to proceed based on various criteria
 		 *
 		 */
 		function SelectPreset()
 		{
 			$preset = $this->GetVar('preset');
 			if ($this->toolkit->systemConfigFound()) {
 				// only at installation first step
 				$status = $this->CheckDatabase(false);
 				if ($status && $this->AlreadyInstalled()) {
 					// if already installed, then all future actions need login to work
 					$this->skipLoginSteps = Array ('check_paths', -1);
 					if (!$preset) {
 						$preset = 'already_installed';
 						$this->currentStep = '';
 					}
 				}
 			}
 			if ($preset === false) {
 				$preset = 'fresh_install'; // default preset
 			}
 
 			$this->stepsPreset = $preset;
 		}
 
 		/**
 		 * Returns variable from request
 		 *
 		 * @param string $name
 		 * @param mixed $default
 		 * @return string|bool
 		 * @access private
 		 */
 		private function GetVar($name, $default = false)
 		{
 			if ( array_key_exists($name, $_COOKIE) ) {
 				return $_COOKIE[$name];
 			}
 
 			if ( array_key_exists($name, $_POST) ) {
 				return $_POST[$name];
 			}
 
 			return array_key_exists($name, $_GET) ? $_GET[$name] : $default;
 		}
 
 		/**
 		 * Sets new value for request variable
 		 *
 		 * @param string $name
 		 * @param mixed $value
 		 * @return void
 		 * @access private
 		 */
 		private function SetVar($name, $value)
 		{
 			$_POST[$name] = $value;
 		}
 
 		/**
 		 * Performs needed intialization of data, that step requires
 		 *
 		 */
 		function InitStep()
 		{
 			$require_login = !in_array($this->currentStep, $this->skipLoginSteps);
 			$this->InitApplication($require_login);
 
 			if ($require_login) {
 				// step require login to proceed
 				if (!$this->Application->LoggedIn()) {
 					$this->stepsPreset = 'already_installed';
 					$this->currentStep = 'install_setup'; // manually set 2nd step, because 'check_paths' step doesn't contain login form
 //					$this->SetFirstStep();
 				}
 			}
 
 			switch ($this->currentStep) {
 				case 'sys_requirements':
 					$required_checks = Array (
 						'php_version', 'composer', 'curl', 'simplexml', 'freetype', 'gd_version',
 						'jpeg', 'mysql', 'json', 'date.timezone', 'output_buffering',
 					);
 
 					$check_results = $this->toolkit->CallPrerequisitesMethod('core/', 'CheckSystemRequirements');
 					$required_checks = array_diff($required_checks, array_keys( array_filter($check_results) ));
 
 					if ( $required_checks ) {
 						// php-based checks failed - show error
 						$this->errorMessage = '<br/>Installation can not continue until all required environment parameters are set correctly';
 					}
 					elseif ( $this->GetVar('js_enabled') === false ) {
 						// can't check JS without form submit - set some fake error, so user stays on this step
 						$this->errorMessage = '&nbsp;';
 					}
 					elseif ( !$this->GetVar('js_enabled') || !$this->GetVar('cookies_enabled') ) {
 						// js/cookies disabled
 						$this->errorMessage = '<br/>Installation can not continue until all required environment parameters are set correctly';
 					}
 					break;
 
 				case 'check_paths':
 					$writeable_base = $this->toolkit->systemConfig->get('WriteablePath', 'Misc');
 					foreach ($this->writeableFolders as $folder_path) {
 						$file_path = FULL_PATH . str_replace('$1', $writeable_base, $folder_path);
 						if (file_exists($file_path) && !is_writable($file_path)) {
 							$this->errorMessage = '<br/>Installation can not continue until all required permissions are set correctly';
 							break;
 						}
 					}
 					break;
 
 				case 'clean_db':
 					// don't use Application, because all tables will be erased and it will crash
 					$sql = 'SELECT Path
 							FROM ' . TABLE_PREFIX . 'Modules';
 					$modules = $this->Conn->GetCol($sql);
 
 					foreach ($modules as $module_folder) {
 						$remove_file = '/' . $module_folder . 'install/remove_schema.sql';
 						if (file_exists(FULL_PATH . $remove_file)) {
 							$this->toolkit->RunSQL($remove_file);
 						}
 					}
 
 					$this->toolkit->deleteEditTables();
 
 					$this->currentStep = $this->GetNextStep();
 					break;
 
 				case 'db_config':
 				case 'db_reconfig':
 					$fields = Array (
 						'DBType', 'DBHost', 'DBName', 'DBUser',
 						'DBUserPassword', 'DBCollation', 'TablePrefix'
 					);
 
 					// set fields
 					foreach ($fields as $field_name) {
 						$submit_value = $this->GetVar($field_name);
 
 						if ($submit_value !== false) {
 							$this->toolkit->systemConfig->set($field_name, 'Database', $submit_value);
 						}
 						/*else {
 							$this->toolkit->systemConfig->set($field_name, 'Database', '');
 						}*/
 					}
 			        break;
 
 				case 'download_license':
 					$license_source = $this->GetVar('license_source');
 					if ($license_source !== false && $license_source != 1) {
 						// previous step was "Select License" and not "Download from Intechnic" option was selected
 						$this->currentStep = $this->GetNextStep();
 					}
 					break;
 
 				case 'choose_modules':
 					// if no modules found, then proceed to next step
 					$modules = $this->ScanModules();
 					if (!$modules) {
 						$this->currentStep = $this->GetNextStep();
 					}
 					break;
 
 				case 'select_theme':
 					// put available theme list in database
 					$this->toolkit->rebuildThemes();
 					break;
 
 				case 'upgrade_modules':
 					// get installed modules from db and compare their versions to upgrade script
 					$modules = $this->GetUpgradableModules();
 					if (!$modules) {
 						$this->currentStep = $this->GetNextStep();
 					}
 					break;
 
 				case 'skin_upgrade':
 					if ($this->Application->RecallVar('SkinUpgradeLog') === false) {
 						// no errors during skin upgrade -> skip this step
 						$this->currentStep = $this->GetNextStep();
 					}
 					break;
 
 				case 'install_setup':
 					if ( $this->Application->TableFound(TABLE_PREFIX . 'UserSession', true) ) {
 						// update to 5.2.0 -> rename session table before using it
 						// don't rename any other table here, since their names could be used in upgrade script
 						$this->Conn->Query('RENAME TABLE ' . TABLE_PREFIX . 'UserSession TO ' . TABLE_PREFIX . 'UserSessions');
 						$this->Conn->Query('RENAME TABLE ' . TABLE_PREFIX . 'SessionData TO ' . TABLE_PREFIX . 'UserSessionData');
 					}
 
 					$next_preset = $this->Application->GetVar('next_preset');
 					if ($next_preset !== false) {
+						/** @var UserHelper $user_helper */
 						$user_helper = $this->Application->recallObject('UserHelper');
-						/* @var $user_helper UserHelper */
 
 						$username = $this->Application->GetVar('login');
 						$password = $this->Application->GetVar('password');
 
 						if ($username == 'root') {
 							// verify "root" user using configuration settings
 							$login_result = $user_helper->loginUser($username, $password);
 
 							if ($login_result != LoginResult::OK) {
 								$error_phrase = $login_result == LoginResult::NO_PERMISSION ? 'la_no_permissions' : 'la_invalid_password';
 								$this->errorMessage = $this->Application->Phrase($error_phrase) . '. If you don\'t know your username or password, contact Intechnic Support';
 							}
 						}
 						else {
 							// non "root" user -> verify using licensing server
 							$url_params = Array (
 								'login' => md5($username),
 								'password' => md5($password),
 								'action' => 'check',
 								'license_code' => base64_encode( $this->toolkit->systemConfig->get('LicenseCode', 'Intechnic') ),
 								'version' => '4.3.0',//$this->toolkit->GetMaxModuleVersion('core/'),
 								'domain' => base64_encode($_SERVER['HTTP_HOST']),
 							);
 
+							/** @var kCurlHelper $curl_helper */
 							$curl_helper = $this->Application->recallObject('CurlHelper');
-							/* @var $curl_helper kCurlHelper */
 
 							$curl_helper->SetRequestData($url_params);
 							$file_data = $curl_helper->Send(GET_LICENSE_URL);
 
 							if ( !$curl_helper->isGoodResponseCode() ) {
 								$this->errorMessage = 'In-Portal servers temporarily unavailable. Please contact <a href="mailto:support@in-portal.com">In-Portal support</a> personnel directly.';
 							}
 							elseif (substr($file_data, 0, 5) == 'Error') {
 								$this->errorMessage = substr($file_data, 6) . ' If you don\'t know your username or password, contact Intechnic Support';
 							}
 
 							if ($this->errorMessage == '') {
 								$user_helper->loginUserById(USER_ROOT);
 							}
 						}
 
 						if ($this->errorMessage == '') {
 							// processed with redirect to selected step preset
 							if (!isset($this->steps[$next_preset])) {
 								$this->errorMessage = 'Preset "'.$next_preset.'" not yet implemented';
 							}
 							else {
 								$this->stepsPreset = $next_preset;
 							}
 						}
 					}
 					else {
 						// if preset was not choosen, then raise error
 						$this->errorMessage = 'Please select action to perform';
 					}
 					break;
 
 				case 'security':
 					// perform write check
 					if ($this->Application->GetVar('skip_security_check')) {
 						// administrator intensionally skips security checks
 						break;
 					}
 
 					$write_check = true;
 					$check_paths = Array ('/', '/index.php', $this->toolkit->systemConfig->get('WriteablePath', 'Misc') . '/config.php', ADMIN_DIRECTORY . '/index.php');
 
 					foreach ($check_paths as $check_path) {
 						$path_check_status = $this->toolkit->checkWritePermissions(FULL_PATH . $check_path);
 
 						if (is_bool($path_check_status) && $path_check_status) {
 							$write_check = false;
 							break;
 						}
 					}
 
 					// script execute check
 					if (file_exists(WRITEABLE . '/install_check.php')) {
 						unlink(WRITEABLE . '/install_check.php');
 					}
 
 					$fp = fopen(WRITEABLE . '/install_check.php', 'w');
 					fwrite($fp, "<?php\n\techo 'OK';\n");
 					fclose($fp);
 
+					/** @var kCurlHelper $curl_helper */
 					$curl_helper = $this->Application->recallObject('CurlHelper');
-					/* @var $curl_helper kCurlHelper */
 
 					$output = $curl_helper->Send($this->Application->BaseURL() . ltrim(WRITEBALE_BASE, '/') . '/install_check.php');
 					unlink(WRITEABLE . '/install_check.php');
 					$execute_check = ($output !== 'OK');
 
 					$directive_check = true;
 					$ini_vars = Array ('register_globals' => false, 'open_basedir' => true, 'allow_url_fopen' => false);
 					foreach ($ini_vars as $var_name => $var_value) {
 						$current_value = ini_get($var_name);
 
 						if (($var_value && !$current_value) || (!$var_value && $current_value)) {
 							$directive_check = false;
 							break;
 						}
 					}
 
 					if (!$write_check || !$execute_check || !$directive_check) {
 						$this->errorMessage = true;
 					}
 					/*else {
 						$this->currentStep = $this->GetNextStep();
 					}*/
 					break;
 			}
 
 			$this->PerformValidation(); // returns validation status (just in case)
 		}
 
 		/**
 		 * Validates data entered by user
 		 *
 		 * @return bool
 		 */
 		function PerformValidation()
 		{
 			if ($this->GetVar('step') != $this->currentStep) {
 				// just redirect from previous step, don't validate
 				return true;
 			}
 
 			$status = true;
 
 			switch ($this->currentStep) {
 				case 'db_config':
 				case 'db_reconfig':
 					// 1. check if required fields are filled
 					$section_name = 'Database';
 					$required_fields = Array ('DBType', 'DBHost', 'DBName', 'DBUser', 'DBCollation');
 					foreach ($required_fields as $required_field) {
 						if (!$this->toolkit->systemConfig->get($required_field, $section_name)) {
 							$status = false;
 							$this->errorMessage = 'Please fill all required fields';
 							break;
 						}
 					}
 
 					if ( !$status ) {
 						break;
 					}
 
 					// 2. check permissions, that use have in this database
 					$status = $this->CheckDatabase(($this->currentStep == 'db_config') && !$this->GetVar('UseExistingSetup'));
 					break;
 
 				case 'select_license':
 					$license_source = $this->GetVar('license_source');
 					if ($license_source == 2) {
 						// license from file -> file must be uploaded
 						$upload_error = $_FILES['license_file']['error'];
 						if ($upload_error != UPLOAD_ERR_OK) {
 							$this->errorMessage = 'Missing License File';
 						}
 					}
 					elseif (!is_numeric($license_source)) {
 						$this->errorMessage = 'Please select license';
 					}
 
 					$status = $this->errorMessage == '';
 					break;
 
 				case 'root_password':
 					// check, that password & verify password match
 					$password = $this->Application->GetVar('root_password');
 					$password_verify = $this->Application->GetVar('root_password_verify');
 
 					if ($password != $password_verify) {
 						$this->errorMessage = 'Passwords does not match';
 					}
 					elseif (mb_strlen($password) < 4) {
 						$this->errorMessage = 'Root Password must be at least 4 characters';
 					}
 
 					$status = $this->errorMessage == '';
 					break;
 
 				case 'choose_modules':
 					break;
 
 				case 'upgrade_modules':
 					$modules = $this->Application->GetVar('modules');
 					if (!$modules) {
 						$modules = Array ();
 						$this->errorMessage = 'Please select module(-s) to ' . ($this->currentStep == 'choose_modules' ? 'install' : 'upgrade');
 					}
 
 					// check interface module
 					$upgrade_data = $this->GetUpgradableModules();
 
 					if (array_key_exists('core', $upgrade_data) && !in_array('core', $modules)) {
 						// core can be upgraded, but isn't selected
 						$this->errorMessage = 'Please select "Core" as interface module';
 					}
 
 					$status = $this->errorMessage == '';
 					break;
 			}
 
 			return $status;
 		}
 
 		/**
 		 * Perform installation step actions
 		 *
 		 */
 		function Run()
 		{
 			if ($this->errorMessage) {
 				// was error during data validation stage
 				return ;
 			}
 
 			switch ($this->currentStep) {
 				case 'db_config':
 				case 'db_reconfig':
 					// store db configuration
 					$sql = 'SHOW COLLATION
 							LIKE \''.$this->toolkit->systemConfig->get('DBCollation', 'Database').'\'';
 					$collation_info = $this->Conn->Query($sql);
 					if ($collation_info) {
 						$this->toolkit->systemConfig->set('DBCharset', 'Database', $collation_info[0]['Charset']);
 
 						// database is already connected, that's why set collation on the fly
 						$this->Conn->Query('SET NAMES \''.$this->toolkit->systemConfig->get('DBCharset', 'Database').'\' COLLATE \''.$this->toolkit->systemConfig->get('DBCollation', 'Database').'\'');
 					}
 
 					$this->toolkit->systemConfig->save();
 
 					if ($this->currentStep == 'db_config') {
 						if ($this->GetVar('UseExistingSetup')) {
 							// abort clean install and redirect to already_installed
 							$this->stepsPreset = 'already_installed';
 							break;
 						}
 
 						// import base data into new database, not for db_reconfig
 						$this->toolkit->RunSQL('/core/install/install_schema.sql');
 						$this->toolkit->RunSQL('/core/install/install_data.sql');
 
 						// create category using sql, because Application is not available here
 						$table_name = $this->toolkit->systemConfig->get('TablePrefix', 'Database') . 'IdGenerator';
 						$this->Conn->Query('UPDATE ' . $table_name . ' SET lastid = lastid + 1');
 						$resource_id = $this->Conn->GetOne('SELECT lastid FROM ' . $table_name);
 						if ($resource_id === false) {
 							$this->Conn->Query('INSERT INTO '.$table_name.' (lastid) VALUES (2)');
 							$resource_id = 2;
 						}
 
 						// can't use USER_ROOT constant, since Application isn't available here
 						$fields_hash = Array (
 							'l1_Name' => 'Content', 'l1_MenuTitle' => 'Content', 'Filename' => 'Content',
 							'AutomaticFilename' => 0, 'CreatedById' => -1, 'CreatedOn' => time(),
 							'ResourceId' => $resource_id - 1, 'l1_Description' => 'Content', 'Status' => 4,
 						);
 
 						$this->Conn->doInsert($fields_hash, $this->toolkit->systemConfig->get('TablePrefix', 'Database') . 'Categories');
 
 						$this->toolkit->SetModuleRootCategory('Core', $this->Conn->getInsertID());
 
 						// set module "Core" version after install (based on upgrade scripts)
 						$this->toolkit->SetModuleVersion('Core', 'core/');
 
 						// for now we set "In-Portal" module version to "Core" module version (during clean install)
 						$this->toolkit->SetModuleVersion('In-Portal', 'core/');
 					}
 					break;
 
 				case 'select_license':
 					// reset memory cache, when application is first available (on fresh install and clean reinstall steps)
 					$this->Application->HandleEvent(new kEvent('adm:OnResetMemcache'));
 
 					$license_source = $this->GetVar('license_source');
 					switch ($license_source) {
 						case 1: // Download from Intechnic
 
 							break;
 
 						case 2: // Upload License File
 							$file_data = array_map('trim', file($_FILES['license_file']['tmp_name']));
 							if ((count($file_data) == 3) && $file_data[1]) {
+								/** @var kModulesHelper $modules_helper */
 								$modules_helper = $this->Application->recallObject('kModulesHelper');
-								/* @var $modules_helper kModulesHelper */
 
 								if ($modules_helper->verifyLicense($file_data[1])) {
 									$this->toolkit->systemConfig->set('License', 'Intechnic', $file_data[1]);
 									$this->toolkit->systemConfig->set('LicenseCode', 'Intechnic', $file_data[2]);
 									$this->toolkit->systemConfig->save();
 								}
 								else {
 									$this->errorMessage = 'Invalid License File';
 								}
 							}
 							else {
 								$this->errorMessage = 'Invalid License File';
 							}
 							break;
 
 						case 3: // Use Existing License
 							$license_hash = $this->toolkit->systemConfig->get('License', 'Intechnic');
 							if ($license_hash) {
+								/** @var kModulesHelper $modules_helper */
 								$modules_helper = $this->Application->recallObject('kModulesHelper');
-								/* @var $modules_helper kModulesHelper */
 
 								if (!$modules_helper->verifyLicense($license_hash)) {
 									$this->errorMessage = 'Invalid or corrupt license detected';
 								}
 							}
 							else {
 								// happens, when browser's "Back" button is used
 								$this->errorMessage = 'Missing License File';
 							}
 							break;
 
 						case 4: // Skip License (Local Domain Installation)
 							if ($this->toolkit->sectionFound('Intechnic')) {
 								// remove any previous license information
 								$this->toolkit->systemConfig->set('License', 'Intechnic');
 								$this->toolkit->systemConfig->set('LicenseCode', 'Intechnic');
 								$this->toolkit->systemConfig->save();
 							}
 							break;
 					}
 					break;
 
 				case 'download_license':
 					$license_login = $this->GetVar('login');
 					$license_password = $this->GetVar('password');
 					$license_id = $this->GetVar('licenses');
 
+					/** @var kCurlHelper $curl_helper */
 					$curl_helper = $this->Application->recallObject('CurlHelper');
-					/* @var $curl_helper kCurlHelper */
 
 					if (strlen($license_login) && strlen($license_password) && !$license_id) {
 						// Here we determine weather login is ok & check available licenses
 						$url_params = Array (
 							'login' => md5($license_login),
 							'password' => md5($license_password),
 							'version' => $this->toolkit->GetMaxModuleVersion('core/'),
 							'domain' => base64_encode($_SERVER['HTTP_HOST']),
 						);
 
 						$curl_helper->SetRequestData($url_params);
 						$file_data = $curl_helper->Send(GET_LICENSE_URL);
 
 						if (!$file_data) {
 							// error connecting to licensing server
 							$this->errorMessage = 'Unable to connect to the Intechnic server! Please try again later!';
 						}
 						else {
 							if (substr($file_data, 0, 5) == 'Error') {
 								// after processing data server returned error
 								$this->errorMessage = substr($file_data, 6);
 							}
 							else {
 								// license received
 								if (substr($file_data, 0, 3) == 'SEL') {
 									// we have more, then one license -> let user choose
 									$this->SetVar('license_selection', base64_encode( substr($file_data, 4) )); // we received html with radio buttons with names "licenses"
 									$this->errorMessage = 'Please select which license to use';
 								}
 								else {
 									// we have one license
 									$this->toolkit->processLicense($file_data);
 								}
 							}
 						}
 					}
 					else if (!$license_id) {
 						// licenses were not queried AND user/password missing
 						$this->errorMessage = 'Incorrect Username or Password. If you don\'t know your username or password, contact Intechnic Support';
 					}
 					else {
 						// Here we download license
 						$url_params = Array (
 							'license_id' => md5($license_id),
 							'dlog' => md5($license_login),
 							'dpass' => md5($license_password),
 							'version' => $this->toolkit->GetMaxModuleVersion('core/'),
 							'domain' => base64_encode($_SERVER['HTTP_HOST']),
 						);
 
 						$curl_helper->SetRequestData($url_params);
 						$file_data = $curl_helper->Send(GET_LICENSE_URL);
 
 						if (!$file_data) {
 							// error connecting to licensing server
 							$this->errorMessage = 'Unable to connect to the Intechnic server! Please try again later!';
 						}
 						else {
 							if (substr($file_data, 0, 5) == 'Error') {
 								// after processing data server returned error
 								$this->errorMessage = substr($file_data, 6);
 							}
 							else {
 								$this->toolkit->processLicense($file_data);
 							}
 						}
 					}
 					break;
 
 				case 'select_domain':
+					/** @var kModulesHelper $modules_helper */
 					$modules_helper = $this->Application->recallObject('kModulesHelper');
-					/* @var $modules_helper kModulesHelper */
 
 					// get domain name as entered by user on the form
 					$domain = $this->GetVar('domain') == 1 ? $_SERVER['HTTP_HOST'] : str_replace(' ', '', $this->GetVar('other'));
 
 					$license_hash = $this->toolkit->systemConfig->get('License', 'Intechnic');
 					if ($license_hash) {
 						// when license present, then extract domain from it
 						$license_hash = base64_decode($license_hash);
 						list ( , , $license_keys) = $modules_helper->_ParseLicense($license_hash);
 						$license_domain = $license_keys[0]['domain'];
 					}
 					else {
 						// when license missing, then use current domain or domain entered by user
 						$license_domain = $domain;
 					}
 
 					if ($domain != '') {
 						if (strstr($domain, $license_domain) || $modules_helper->_IsLocalSite($domain)) {
 							$this->toolkit->systemConfig->set('Domain', 'Misc', $domain);
 							$this->toolkit->systemConfig->save();
 						}
 						else {
 							$this->errorMessage = 'Domain name entered does not match domain name in the license!';
 						}
 					}
 					else {
 						$this->errorMessage = 'Please enter valid domain!';
 					}
 					break;
 
 				case 'sys_config':
 					$config_data = $this->GetVar('system_config');
 
 					foreach ($config_data as $section => $section_vars) {
 						foreach ($section_vars as $var_name => $var_value) {
 							$this->toolkit->systemConfig->set($var_name, $section, $var_value);
 						}
 					}
 
 					$this->toolkit->systemConfig->save();
 					break;
 
 				case 'root_password':
 					// update root password in database
+					/** @var kPasswordFormatter $password_formatter */
 					$password_formatter = $this->Application->recallObject('kPasswordFormatter');
-					/* @var $password_formatter kPasswordFormatter */
 
 					$config_values = Array (
 						'RootPass' => $password_formatter->hashPassword($this->Application->GetVar('root_password')),
 						'Backup_Path' => FULL_PATH . $this->toolkit->systemConfig->get('WriteablePath', 'Misc') . DIRECTORY_SEPARATOR . 'backupdata',
 						'DefaultEmailSender' => 'portal@' . $this->toolkit->systemConfig->get('Domain', 'Misc')
 					);
 
 					$site_timezone = date_default_timezone_get();
 
 					if ($site_timezone) {
 						$config_values['Config_Site_Time'] = $site_timezone;
 					}
 
 					$this->toolkit->saveConfigValues($config_values);
 
+					/** @var UserHelper $user_helper */
 					$user_helper = $this->Application->recallObject('UserHelper');
-					/* @var $user_helper UserHelper */
 
 					// login as "root", when no errors on password screen
 					$user_helper->loginUser('root', $this->Application->GetVar('root_password'));
 
 					// import base language for core (english)
 					$this->toolkit->ImportLanguage('/core/install/english');
 
 					// make sure imported language is set as active in session, created during installation
 					$this->Application->Session->SetField('Language', 1);
 
 					// set imported language as primary
+					/** @var LanguagesItem $lang */
 					$lang = $this->Application->recallObject('lang.-item', null, Array('skip_autoload' => true));
-					/* @var $lang LanguagesItem */
 
 					$lang->Load(1); // fresh install => ID=1
 					$lang->setPrimary(true); // for Front-End
 					break;
 
 				case 'choose_modules':
 					// run module install scripts
 					$modules = $this->Application->GetVar('modules');
 					if ($modules) {
 						foreach ($modules as $module) {
 							$install_file = MODULES_PATH.'/'.$module.'/install.php';
 							if (file_exists($install_file)) {
 								include_once($install_file);
 							}
 						}
 					}
 
 					// update category cache
+					/** @var kPermCacheUpdater $updater */
 					$updater = $this->Application->makeClass('kPermCacheUpdater');
-					/* @var $updater kPermCacheUpdater */
 
 					$updater->OneStepRun();
 					break;
 
 				case 'post_config':
 					$this->toolkit->saveConfigValues( $this->GetVar('config') );
 					break;
 
 				case 'select_theme':
 					// 1. mark theme, that user is selected
 					$theme_id = $this->GetVar('theme');
 					$theme_config = $this->Application->getUnitConfig('theme');
 					$theme_table = $theme_config->getTableName();
 					$theme_id_field = $theme_config->getIDField();
 
 					$sql = 'UPDATE ' . $theme_table . '
 							SET Enabled = 1, PrimaryTheme = 1
 							WHERE ' . $theme_id_field . ' = ' . $theme_id;
 					$this->Conn->Query($sql);
 
 					$this->toolkit->rebuildThemes(); // rescan theme to create structure after theme is enabled !!!
 
 					// install theme dependent demo data
 					if ($this->Application->GetVar('install_demo_data')) {
 						$sql = 'SELECT Name
 								FROM ' . $theme_table . '
 								WHERE ' . $theme_id_field . ' = ' . $theme_id;
 						$theme_name = $this->Conn->GetOne($sql);
 						$site_path = $this->toolkit->systemConfig->get('WebsitePath','Misc') . '/';
 
+						/** @var FileHelper $file_helper */
 						$file_helper = $this->Application->recallObject('FileHelper');
-						/* @var $file_helper FileHelper */
 
 						foreach ($this->Application->ModuleInfo as $module_name => $module_info) {
 							if ($module_name == 'In-Portal') {
 								continue;
 							}
 
 							$template_path = '/themes' . '/' . $theme_name . '/' . $module_info['TemplatePath'];
 							$this->toolkit->RunSQL( $template_path . '_install/install_data.sql', Array('{ThemeId}', '{SitePath}'), Array($theme_id, $site_path) );
 
 							if ( file_exists(FULL_PATH . $template_path . '_install/images') ) {
 								// copy theme demo images into writable path accessible by FCKEditor
 								$file_helper->copyFolderRecursive(FULL_PATH . $template_path . '_install/images' . DIRECTORY_SEPARATOR, WRITEABLE . '/user_files/Images');
 							}
 						}
 					}
 					break;
 
 				case 'upgrade_modules':
 					// get installed modules from db and compare their versions to upgrade script
 					$modules = $this->Application->GetVar('modules');
 
 					if ($modules) {
 						$upgrade_data = $this->GetUpgradableModules();
 						$start_from_query = $this->Application->GetVar('start_from_query');
 						$this->upgradeDepencies = $this->getUpgradeDependencies($modules, $upgrade_data);
 
 						if ($start_from_query !== false) {
 							$this->upgradeLog = unserialize( $this->Application->RecallVar('UpgradeLog') );
 						}
 						else {
 							$start_from_query = 0;
 							$this->upgradeLog = Array ('ModuleVersions' => Array ());
 
 							// remember each module version, before upgrade scripts are executed
 							foreach ($modules as $module_name) {
 								$module_info = $upgrade_data[$module_name];
 								$this->upgradeLog['ModuleVersions'][$module_name] = $module_info['FromVersion'];
 							}
 
 							$this->Application->RemoveVar('UpgradeLog');
 						}
 
 						// 1. perform "php before", "sql", "php after" upgrades
 						foreach ($modules as $module_name) {
 							$module_info = $upgrade_data[$module_name];
 
 							/*echo '<h2>Upgrading "' . $module_info['Name'] . '" to "' . $module_info['ToVersion'] . '"</h2>' . "\n";
 							flush();*/
 
 							if (!$this->RunUpgrade($module_info['Name'], $module_info['ToVersion'], $upgrade_data, $start_from_query)) {
 								$this->Application->StoreVar('UpgradeLog', serialize($this->upgradeLog));
 								$this->Done();
 							}
 
 							// restore upgradable module version (makes sense after sql error processing)
 							$upgrade_data[$module_name]['FromVersion'] = $this->upgradeLog['ModuleVersions'][$module_name];
 						}
 
 						// 2. import language pack, perform "languagepack" upgrade for all upgraded versions
 						foreach ($modules as $module_name) {
 							$module_info = $upgrade_data[$module_name];
 							$sqls =& $this->getUpgradeQueriesFromVersion($module_info['Path'], $module_info['FromVersion']);
 							preg_match_all('/' . VERSION_MARK . '/s', $sqls, $regs);
 
 							// import module language pack
 							$this->toolkit->ImportLanguage('/' . $module_info['Path'] . 'install/english', true);
 
 							// perform advanced language pack upgrade
 							foreach ($regs[1] as $version) {
 								$this->RunUpgradeScript($module_info['Path'], $version, 'languagepack');
 							}
 						}
 
 						// 3. update all theme language packs
+						/** @var kThemesHelper $themes_helper */
 						$themes_helper = $this->Application->recallObject('ThemesHelper');
-						/* @var $themes_helper kThemesHelper */
 
 						$themes_helper->synchronizeModule(false);
 
 						// 4. upgrade admin skin
 						if (in_array('core', $modules)) {
 							$skin_upgrade_log = $this->toolkit->upgradeSkin($upgrade_data['core']);
 
 							if ($skin_upgrade_log === true) {
 								$this->Application->RemoveVar('SkinUpgradeLog');
 							}
 							else {
 								$this->Application->StoreVar('SkinUpgradeLog', serialize($skin_upgrade_log));
 							}
 
 							// for now we set "In-Portal" module version to "Core" module version (during upgrade)
 							$this->toolkit->SetModuleVersion('In-Portal', false, $upgrade_data['core']['ToVersion']);
 						}
 					}
 					break;
 
 				case 'finish':
 					// delete cache
 					$this->toolkit->deleteCache();
 					$this->toolkit->rebuildThemes();
 
 					// compile admin skin, so it will be available in 3 frames at once
+					/** @var SkinHelper $skin_helper */
 					$skin_helper = $this->Application->recallObject('SkinHelper');
-					/* @var $skin_helper SkinHelper */
 
+					/** @var kDBItem $skin */
 					$skin = $this->Application->recallObject('skin', null, Array ('skip_autoload' => true));
-					/* @var $skin kDBItem */
 
 					$skin->Load(1, 'IsPrimary');
 					$skin_helper->compile($skin);
 
 					// set installation finished mark
 					if ($this->Application->ConfigValue('InstallFinished') === false) {
 						$fields_hash = Array (
 							'VariableName'	=>	'InstallFinished',
 							'VariableValue'	=>	1,
 						);
 						$this->Conn->doInsert($fields_hash, TABLE_PREFIX.'SystemSettings');
 					}
 
 					$random_string = $this->Application->ConfigValue('RandomString');
 
 					if ( !$random_string ) {
 						$user_helper = $this->Application->recallObject('UserHelper');
 						/* @var $user_helper UserHelper */
 
 						$random_string = $user_helper->generateRandomString(64, true, true);
 						$this->Application->SetConfigValue('RandomString', $random_string);
 					}
 
 					break;
 			}
 
 			if ($this->errorMessage) {
 				// was error during run stage
 				return ;
 			}
 
 			$this->currentStep = $this->GetNextStep();
 			$this->InitStep(); // init next step (that will be shown now)
 
 			$this->InitApplication();
 
 			if ($this->currentStep == -1) {
 				// step after last step -> redirect to admin
+                /** @var UserHelper $user_helper */
                 $user_helper = $this->Application->recallObject('UserHelper');
-                /* @var $user_helper UserHelper */
 
                 $user_helper->logoutUser();
 
 				$this->Application->Redirect($user_helper->event->redirect, $user_helper->event->getRedirectParams(), '', 'index.php');
 			}
 		}
 
 		function getUpgradeDependencies($modules, &$upgrade_data)
 		{
 			$dependencies = Array ();
 
 			foreach ($modules as $module_name) {
 				$module_info = $upgrade_data[$module_name];
 				$upgrade_object =& $this->getUpgradeObject($module_info['Path']);
 
 				if (!is_object($upgrade_object)) {
 					continue;
 				}
 
 				foreach ($upgrade_object->dependencies as $dependent_version => $version_dependencies) {
 					if (!$version_dependencies) {
 						// module is independent -> skip
 						continue;
 					}
 
 					list ($parent_name, $parent_version) = each($version_dependencies);
 
 					if (!array_key_exists($parent_name, $dependencies)) {
 						// parent module
 						$dependencies[$parent_name] = Array ();
 					}
 
 					if (!array_key_exists($parent_version, $dependencies[$parent_name])) {
 						// parent module versions, that are required by other module versions
 						$dependencies[$parent_name][$parent_version] = Array ();
 					}
 
 					$dependencies[$parent_name][$parent_version][] = Array ($module_info['Name'] => $dependent_version);
 				}
 			}
 
 			return $dependencies;
 		}
 
 		/**
 		 * Returns database queries, that should be executed to perform upgrade from given to lastest version of given module path
 		 *
 		 * @param string $module_path
 		 * @param string $from_version
 		 * @return string
 		 */
 		function &getUpgradeQueriesFromVersion($module_path, $from_version)
 		{
 			$upgrades_file = sprintf(UPGRADES_FILE, $module_path, 'sql');
 
 			$sqls = file_get_contents($upgrades_file);
 			$version_mark = preg_replace('/(\(.*?\))/', $from_version, VERSION_MARK);
 
 			// get only sqls from next (relative to current) version to end of file
 			$start_pos = strpos($sqls, $version_mark);
 			$sqls = substr($sqls, $start_pos);
 
 			return $sqls;
 		}
 
 		function RunUpgrade($module_name, $to_version, &$upgrade_data, &$start_from_query)
 		{
 			$module_info = $upgrade_data[ strtolower($module_name) ];
 
 			$sqls =& $this->getUpgradeQueriesFromVersion($module_info['Path'], $module_info['FromVersion']);
 			preg_match_all('/(' . VERSION_MARK . ')/s', $sqls, $matches, PREG_SET_ORDER + PREG_OFFSET_CAPTURE);
 
 			foreach ($matches as $index => $match) {
 				// upgrade version
 				$version = $match[2][0];
 
 				if ($this->toolkit->ConvertModuleVersion($version) > $this->toolkit->ConvertModuleVersion($to_version)) {
 					// only upgrade to $to_version, not further
 					break;
 				}
 
 				if (!in_array($module_name . ':' . $version, $this->upgradeLog)) {
 					if ($this->Application->isDebugMode()) {
 						$this->Application->Debugger->appendHTML('Upgrading "' . $module_name . '" to "' . $version . '" version: BEGIN.');
 					}
 
 					/*echo 'Upgrading "' . $module_name . '" to "' . $version . '".<br/>' . "\n";
 					flush();*/
 
 					// don't upgrade same version twice
 					$start_pos = $match[0][1] + strlen($match[0][0]);
 					$end_pos = array_key_exists($index + 1, $matches) ? $matches[$index + 1][0][1] : strlen($sqls);
 					$version_sqls = substr($sqls, $start_pos, $end_pos - $start_pos);
 
 					if ($start_from_query == 0) {
 						$this->RunUpgradeScript($module_info['Path'], $version, 'before');
 					}
 
 					if (!$this->toolkit->RunSQLText($version_sqls, null, null, $start_from_query)) {
 						$this->errorMessage .= '<input type="hidden" name="start_from_query" value="' . $this->LastQueryNum . '">';
 						$this->errorMessage .= '<br/>Module "' . $module_name . '" upgrade to "' . $version . '" failed.';
 						$this->errorMessage .= '<br/>Click Continue button below to skip this query and go further<br/>';
 
 						return false;
 					}
 					else {
 						// reset query counter, when all queries were processed
 						$start_from_query = 0;
 					}
 
 					$this->RunUpgradeScript($module_info['Path'], $version, 'after');
 
 					if ($this->Application->isDebugMode()) {
 						$this->Application->Debugger->appendHTML('Upgrading "' . $module_name . '" to "' . $version . '" version: END.');
 					}
 
 					// remember, that we've already upgraded given version
 					$this->upgradeLog[] = $module_name . ':' . $version;
 				}
 
 				if (array_key_exists($module_name, $this->upgradeDepencies) && array_key_exists($version, $this->upgradeDepencies[$module_name])) {
 					foreach ($this->upgradeDepencies[$module_name][$version] as $dependency_info) {
 						list ($dependent_module, $dependent_version) = each($dependency_info);
 
 						if (!$this->RunUpgrade($dependent_module, $dependent_version, $upgrade_data, $start_from_query)) {
 							return false;
 						}
 					}
 				}
 
 				// only mark module as updated, when all it's dependent modules are upgraded
 				$this->toolkit->SetModuleVersion($module_name, false, $version);
 			}
 
 			return true;
 		}
 
 		/**
 		 * Run upgrade PHP scripts for module with specified path
 		 *
 		 * @param string $module_path
 		 * @param Array $version
 		 * @param string $mode upgrade mode = {before,after,languagepack}
 		 */
 		function RunUpgradeScript($module_path, $version, $mode)
 		{
 			$upgrade_object =& $this->getUpgradeObject($module_path);
 
 			if (!is_object($upgrade_object)) {
 				return ;
 			}
 
 			$upgrade_method = 'Upgrade_' . str_replace(Array ('.', '-'), '_', $version);
 
 			if (method_exists($upgrade_object, $upgrade_method)) {
 				$upgrade_object->$upgrade_method($mode);
 			}
 		}
 
 		/**
 		 * Returns upgrade class for given module path
 		 *
 		 * @param string $module_path
 		 * @return kUpgradeHelper
 		 */
 		function &getUpgradeObject($module_path)
 		{
 			static $upgrade_classes = Array ();
 			$upgrades_file = sprintf(UPGRADES_FILE, $module_path, 'php');
 
 			if (!file_exists($upgrades_file)) {
 				$false = false;
 				return $false;
 			}
 
 			if (!isset($upgrade_classes[$module_path])) {
 				require_once(FULL_PATH . REL_PATH . '/install/upgrade_helper.php');
 
 				// save class name, because 2nd time (in after call)
 				// $upgrade_class variable will not be present
 				include_once $upgrades_file;
 				$upgrade_classes[$module_path] = $upgrade_class;
 			}
 
+			/** @var CoreUpgrades $upgrade_object */
 			$upgrade_object = new $upgrade_classes[$module_path]();
-			/* @var $upgrade_object CoreUpgrades */
 
 			$upgrade_object->setToolkit($this->toolkit);
 
 			return $upgrade_object;
 		}
 
 		/**
 		 * Initialize kApplication
 		 *
 		 * @param bool $force initialize in any case
 		 */
 		function InitApplication($force = false)
 		{
 			if (($force || !in_array($this->currentStep, $this->skipApplicationSteps)) && !isset($this->Application)) {
 				// step is allowed for application usage & it was not initialized in previous step
 				global $start, $debugger, $dbg_options;
 				include_once(FULL_PATH.'/core/kernel/startup.php');
 
 				$this->Application =& kApplication::Instance();
 				$this->toolkit->Application =& kApplication::Instance();
 
 				$this->includeModuleConstants();
 				$this->Application->Init();
 
 				$this->Conn =& $this->Application->GetADODBConnection();
 				$this->toolkit->Conn =& $this->Application->GetADODBConnection();
 			}
 		}
 
 		/**
 		 * When no modules installed, then pre-include all modules contants, since they are used in unit configs
 		 *
 		 */
 		function includeModuleConstants()
 		{
 			$modules = $this->ScanModules();
 
 			foreach ($modules as $module_path) {
 				$constants_file = MODULES_PATH . '/' . $module_path . '/constants.php';
 
 				if ( file_exists($constants_file) ) {
 					kUtil::includeOnce($constants_file);
 				}
 			}
 		}
 
 		/**
 		 * Show next step screen
 		 *
 		 * @param string $error_message
 		 * @return void
 		 */
 		function Done($error_message = null)
 		{
 			if ( isset($error_message) ) {
 				$this->errorMessage = $error_message;
 			}
 
 			include_once (FULL_PATH . '/' . REL_PATH . '/install/incs/install.tpl');
 
 			if ( isset($this->Application) ) {
 				$this->Application->Done();
 			}
 
 			exit;
 		}
 
 		function ConnectToDatabase()
 		{
 			include_once FULL_PATH . '/core/kernel/db/i_db_connection.php';
 			include_once FULL_PATH . '/core/kernel/db/db_connection.php';
 
 			$required_keys = Array ('DBType', 'DBUser', 'DBName');
 			foreach ($required_keys as $required_key) {
 				if (!$this->toolkit->systemConfig->get($required_key, 'Database')) {
 					// one of required db connection settings missing -> abort connection
 					return false;
 				}
 			}
 
 			$this->Conn = new kDBConnection($this->toolkit->systemConfig->get('DBType', 'Database'), Array(&$this, 'DBErrorHandler'));
 			$this->Conn->setup($this->toolkit->systemConfig->getData());
 
 			// setup toolkit too
 			$this->toolkit->Conn =& $this->Conn;
 
 			return !$this->Conn->hasError();
 		}
 
 		/**
 		 * Checks if core is already installed
 		 *
 		 * @return bool
 		 */
 		function AlreadyInstalled()
 		{
 			$table_prefix = $this->toolkit->systemConfig->get('TablePrefix', 'Database');
 			$settings_table = $this->TableExists('ConfigurationValues') ? 'ConfigurationValues' : 'SystemSettings';
 
 			$sql = 'SELECT VariableValue
 					FROM ' . $table_prefix . $settings_table . '
 					WHERE VariableName = "InstallFinished"';
 
 			return $this->TableExists($settings_table) && $this->Conn->GetOne($sql);
 		}
 
 		function CheckDatabase($check_installed = true)
 		{
 			// perform various check type to database specified
 			// 1. user is allowed to connect to database
 			// 2. user has all types of permissions in database
 			// 3. database environment settings met minimum requirements
 
 			if (mb_strlen($this->toolkit->systemConfig->get('TablePrefix', 'Database')) > 7) {
 				$this->errorMessage = 'Table prefix should not be longer than 7 characters';
 				return false;
 			}
 
 			// connect to database
 			$status = $this->ConnectToDatabase();
 			if ($status) {
 				// if connected, then check if all sql statements work
 				$sql_tests[] = 'DROP TABLE IF EXISTS test_table';
 				$sql_tests[] = 'CREATE TABLE test_table(test_col mediumint(6))';
 				$sql_tests[] = 'LOCK TABLES test_table WRITE';
 				$sql_tests[] = 'INSERT INTO test_table(test_col) VALUES (5)';
 				$sql_tests[] = 'UPDATE test_table SET test_col = 12';
 				$sql_tests[] = 'UNLOCK TABLES';
 				$sql_tests[] = 'ALTER TABLE test_table ADD COLUMN new_col varchar(10)';
 				$sql_tests[] = 'SELECT * FROM test_table';
 				$sql_tests[] = 'DELETE FROM test_table';
 				$sql_tests[] = 'DROP TABLE IF EXISTS test_table';
 
 				foreach ($sql_tests as $sql_test) {
 					$this->Conn->Query($sql_test);
 					if ($this->Conn->getErrorCode() != 0) {
 						$status = false;
 						break;
 					}
 				}
 
 				if ($status) {
 					// if statements work & connection made, then check table existance
 					if ($check_installed && $this->AlreadyInstalled()) {
 						$this->errorMessage = 'An In-Portal Database already exists at this location';
 						return false;
 					}
 
 					$requirements_error = Array ();
 					$db_check_results = $this->toolkit->CallPrerequisitesMethod('core/', 'CheckDBRequirements');
 
 					if ( !$db_check_results['version'] ) {
 						$requirements_error[] = '- MySQL Version is below 5.0';
 					}
 
 					if ( !$db_check_results['packet_size'] ) {
 						$requirements_error[] = '- MySQL Packet Size is below 1 MB';
 					}
 
 					if ( $requirements_error ) {
 						$this->errorMessage = 'Connection successful, but following system requirements were not met:<br/>' . implode('<br/>', $requirements_error);
 						return false;
 					}
 				}
 				else {
 					// user has insufficient permissions in database specified
 					$this->errorMessage = 'Permission Error: ('.$this->Conn->getErrorCode().') '.$this->Conn->getErrorMsg();
 					return false;
 				}
 			}
 			else {
 				// was error while connecting
 				if (!$this->Conn) return false;
 				$this->errorMessage = 'Connection Error: ('.$this->Conn->getErrorCode().') '.$this->Conn->getErrorMsg();
 				return false;
 			}
 
 			return true;
 		}
 
 		/**
 		 * Checks if all passed tables exists
 		 *
 		 * @param string $tables comma separated tables list
 		 * @return bool
 		 */
 		function TableExists($tables)
 		{
 			$prefix = $this->toolkit->systemConfig->get('TablePrefix', 'Database');
 
 			$all_found = true;
 			$tables = explode(',', $tables);
 			foreach ($tables as $table_name) {
 				$sql = 'SHOW TABLES LIKE "'.$prefix.$table_name.'"';
 				if (count($this->Conn->Query($sql)) == 0) {
 					$all_found = false;
 					break;
 				}
 			}
 
 			return $all_found;
 		}
 
 		/**
 		 * Returns modules list found in modules folder
 		 *
 		 * @return Array
 		 */
 		function ScanModules()
 		{
 			static $modules = null;
 
 			if ( !isset($modules) ) {
 				// use direct include, because it's called before kApplication::Init, that creates class factory
 				kUtil::includeOnce( KERNEL_PATH . kApplication::MODULE_HELPER_PATH );
 
 				$modules_helper = new kModulesHelper();
 				$modules = $modules_helper->getModules();
 			}
 
 			return $modules;
 		}
 
 		/**
 		 * Virtually place module under "modules" folder or it won't be recognized during upgrade to 5.1.0 version
 		 *
 		 * @param string $name
 		 * @param string $path
 		 * @param string $version
 		 * @return string
 		 */
 		function getModulePath($name, $path, $version)
 		{
 			if ($name == 'Core') {
 				// don't transform path for Core module
 				return $path;
 			}
 
 			if (!preg_match('/^modules\//', $path)) {
 				// upgrade from 5.0.x/1.0.x to 5.1.x/1.1.x
 				return 'modules/' . $path;
 			}
 
 			return $path;
 		}
 
 		/**
 		 * Returns list of modules, that can be upgraded
 		 *
 		 */
 		function GetUpgradableModules()
 		{
 			$ret = Array ();
 
 			foreach ($this->Application->ModuleInfo as $module_name => $module_info) {
 				if ($module_name == 'In-Portal') {
 					// don't show In-Portal, because it shares upgrade scripts with Core module
 					continue;
 				}
 
 				$module_info['Path'] = $this->getModulePath($module_name, $module_info['Path'], $module_info['Version']);
 				$upgrades_file = sprintf(UPGRADES_FILE, $module_info['Path'], 'sql');
 
 				if (!file_exists($upgrades_file)) {
 					// no upgrade file
 					continue;
 				}
 
 				$sqls = file_get_contents($upgrades_file);
 				$versions_found = preg_match_all('/'.VERSION_MARK.'/s', $sqls, $regs);
 				if (!$versions_found) {
 					// upgrades file doesn't contain version definitions
 					continue;
 				}
 
 				$to_version = end($regs[1]);
 				$this_version = $this->toolkit->ConvertModuleVersion($module_info['Version']);
 				if ($this->toolkit->ConvertModuleVersion($to_version) > $this_version) {
 					// destination version is greather then current
 					foreach ($regs[1] as $version) {
 						if ($this->toolkit->ConvertModuleVersion($version) > $this_version) {
 							$from_version = $version;
 							break;
 						}
 					}
 
 					$version_info = Array (
 						'FromVersion'	=>	$from_version,
 						'ToVersion'		=>	$to_version,
 					);
 
 					$ret[ strtolower($module_name) ] = array_merge($module_info, $version_info);
 				}
 			}
 
 			return $ret;
 		}
 
 		/**
 		 * Returns content to show for current step
 		 *
 		 * @return string
 		 */
 		function GetStepBody()
 		{
 			$step_template = FULL_PATH.'/core/install/step_templates/'.$this->currentStep.'.tpl';
 			if (file_exists($step_template)) {
 				ob_start();
 				include_once ($step_template);
 				return ob_get_clean();
 			}
 
 			return '{step template "'.$this->currentStep.'" missing}';
 		}
 
 		/**
 		 * Parses step information file, cache result for current step ONLY & return it
 		 *
 		 * @return Array
 		 */
 		function &_getStepInfo()
 		{
 			static $info = Array('help_title' => null, 'step_title' => null, 'help_body' => null, 'queried' => false);
 
 			if (!$info['queried']) {
 				$fdata = file_get_contents($this->StepDBFile);
 
 				$parser = xml_parser_create();
 				xml_parse_into_struct($parser, $fdata, $values, $index);
 				xml_parser_free($parser);
 
 				foreach ($index['STEP'] as $section_index) {
 					$step_data =& $values[$section_index];
 
 					if ($step_data['attributes']['NAME'] == $this->currentStep) {
 						$info['step_title'] = $step_data['attributes']['TITLE'];
 						if (isset($step_data['attributes']['HELP_TITLE'])) {
 							$info['help_title'] = $step_data['attributes']['HELP_TITLE'];
 						}
 						else {
 							// if help title not set, then use step title
 							$info['help_title'] = $step_data['attributes']['TITLE'];
 						}
 						$info['help_body'] = trim($step_data['value']);
 						break;
 					}
 				}
 
 				$info['queried'] = true;
 			}
 
 			return $info;
 		}
 
 		/**
 		 * Returns particular information abou current step
 		 *
 		 * @param string $info_type
 		 * @return string
 		 */
 		function GetStepInfo($info_type)
 		{
 			$step_info =& $this->_getStepInfo();
 
 			if (isset($step_info[$info_type])) {
 				return $step_info[$info_type];
 			}
 
 			return '{step "'.$this->currentStep.'"; param "'.$info_type.'" missing}';
 		}
 
 		/**
 		 * Returns passed steps titles
 		 *
 		 * @param Array $steps
 		 * @return Array
 		 * @see kInstaller:PrintSteps
 		 */
 		function _getStepTitles($steps)
 		{
 			$fdata = file_get_contents($this->StepDBFile);
 
 			$parser = xml_parser_create();
 			xml_parse_into_struct($parser, $fdata, $values, $index);
 			xml_parser_free($parser);
 
 			$ret = Array ();
 			foreach ($index['STEP'] as $section_index) {
 				$step_data =& $values[$section_index];
 				if (in_array($step_data['attributes']['NAME'], $steps)) {
 					$ret[ $step_data['attributes']['NAME'] ] = $step_data['attributes']['TITLE'];
 				}
 			}
 
 			return $ret;
 		}
 
 		/**
 		 * Returns current step number in active steps_preset.
 		 * Value can't be cached, because same step can have different number in different presets
 		 *
 		 * @return int
 		 */
 		function GetStepNumber()
 		{
 			return array_search($this->currentStep, $this->steps[$this->stepsPreset]) + 1;
 		}
 
 		/**
 		 * Returns step name to process next
 		 *
 		 * @return string
 		 */
 		function GetNextStep()
 		{
 			$next_index = $this->GetStepNumber();
 			if ($next_index > count($this->steps[$this->stepsPreset]) - 1) {
 				return -1;
 			}
 
 			return $this->steps[$this->stepsPreset][$next_index];
 		}
 
 		/**
 		 * Returns step name, that was processed before this step
 		 *
 		 * @return string
 		 */
 		function GetPreviousStep()
 		{
 			$next_index = $this->GetStepNumber() - 1;
 			if ($next_index < 0) {
 				$next_index = 0;
 			}
 
 			return $this->steps[$this->stepsPreset][$next_index];
 		}
 
 		/**
 		 * Prints all steps from active steps preset and highlights current step
 		 *
 		 * @param string $active_tpl
 		 * @param string $passive_tpl
 		 * @return string
 		 */
 		function PrintSteps($active_tpl, $passive_tpl)
 		{
 			$ret = '';
 			$step_titles = $this->_getStepTitles($this->steps[$this->stepsPreset]);
 
 			foreach ($this->steps[$this->stepsPreset] as $step_name) {
 				$template = $step_name == $this->currentStep ? $active_tpl : $passive_tpl;
 				$ret .= sprintf($template, $step_titles[$step_name]);
 			}
 
 			return $ret;
 		}
 
 		/**
 		 * Installation error handler for sql errors
 		 *
 		 * @param int $code
 		 * @param string $msg
 		 * @param string $sql
 		 * @return bool
 		 * @access private
 		 */
 		function DBErrorHandler($code, $msg, $sql)
 		{
 			$this->errorMessage = 'Query: <br />'.htmlspecialchars($sql, ENT_QUOTES, 'UTF-8').'<br />execution result is error:<br />['.$code.'] '.$msg;
 			return true;
 		}
 
 		/**
 		 * Installation error handler
 		 *
 		 * @param int $errno
 		 * @param string $errstr
 		 * @param string $errfile
 		 * @param int $errline
 		 * @param Array|string $errcontext
 		 */
 		function ErrorHandler($errno, $errstr, $errfile = '', $errline = 0, $errcontext = '')
 		{
 			if ($errno == E_USER_ERROR) {
 				// only react on user fatal errors
 				$this->Done($errstr);
 			}
 		}
 
 		/**
 		 * Checks, that given button should be visible on current installation step
 		 *
 		 * @param string $name
 		 * @return bool
 		 */
 		function buttonVisible($name)
 		{
 			$button_visibility = Array (
 				'continue' => $this->GetNextStep() != -1 || ($this->stepsPreset == 'already_installed'),
 				'refresh' => in_array($this->currentStep, Array ('sys_requirements', 'check_paths', 'security')),
 				'back' => in_array($this->currentStep, Array (/*'select_license',*/ 'download_license', 'select_domain')),
 			);
 
 			if ($name == 'any') {
 				foreach ($button_visibility as $button_name => $button_visible) {
 					if ($button_visible) {
 						return true;
 					}
 				}
 
 				return false;
 			}
 
 			return array_key_exists($name, $button_visibility) ? $button_visibility[$name] : true;
 		}
 	}

Property changes on: branches/5.3.x
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /in-portal/branches/5.2.x:r16513